From: Arne Fitzenreiter Date: Sun, 6 Feb 2022 14:09:43 +0000 (+0000) Subject: kernel: update to 5.15.21 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=70c57ed33ef92d56b8b446e25bc95d7fa748e58d kernel: update to 5.15.21 Signed-off-by: Arne Fitzenreiter --- diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 60a0d90b0a..2a1fb12b8d 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.16-ipfire Kernel Configuration +# Linux/arm64 5.15.21-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire index c4d0d2cbe7..c4371b2949 100644 --- a/config/kernel/kernel.config.armv6l-ipfire +++ b/config/kernel/kernel.config.armv6l-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.15.16-ipfire Kernel Configuration +# Linux/arm 5.15.21-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index f765498b85..a494a2f00d 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.16-ipfire Kernel Configuration +# Linux/x86 5.15.21-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 69413f49dd..e966afe275 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -15489,6 +15489,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/uapi/linux/cryptouser.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cuda.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cxl_mem.h +#lib/modules/KVER-ipfire/build/include/uapi/linux/cyclades.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cycx_cfm.h #lib/modules/KVER-ipfire/build/include/uapi/linux/dcbnl.h #lib/modules/KVER-ipfire/build/include/uapi/linux/dccp.h diff --git a/config/rootfiles/common/aarch64/linux-headers b/config/rootfiles/common/aarch64/linux-headers index 72406dca84..3cc1d3efad 100644 --- a/config/rootfiles/common/aarch64/linux-headers +++ b/config/rootfiles/common/aarch64/linux-headers @@ -206,6 +206,7 @@ #usr/include/linux/cryptouser.h #usr/include/linux/cuda.h #usr/include/linux/cxl_mem.h +#usr/include/linux/cyclades.h #usr/include/linux/cycx_cfm.h #usr/include/linux/dcbnl.h #usr/include/linux/dccp.h diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/armv6l/linux index fd6cb50410..e2eb690f1c 100644 --- a/config/rootfiles/common/armv6l/linux +++ b/config/rootfiles/common/armv6l/linux @@ -15961,6 +15961,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/uapi/linux/cryptouser.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cuda.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cxl_mem.h +#lib/modules/KVER-ipfire/build/include/uapi/linux/cyclades.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cycx_cfm.h #lib/modules/KVER-ipfire/build/include/uapi/linux/dcbnl.h #lib/modules/KVER-ipfire/build/include/uapi/linux/dccp.h diff --git a/config/rootfiles/common/armv6l/linux-headers b/config/rootfiles/common/armv6l/linux-headers index 8b028b07d0..25517dff99 100644 --- a/config/rootfiles/common/armv6l/linux-headers +++ b/config/rootfiles/common/armv6l/linux-headers @@ -205,6 +205,7 @@ #usr/include/linux/cryptouser.h #usr/include/linux/cuda.h #usr/include/linux/cxl_mem.h +#usr/include/linux/cyclades.h #usr/include/linux/cycx_cfm.h #usr/include/linux/dcbnl.h #usr/include/linux/dccp.h diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index e677e4c06e..a01af1fc48 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -11058,7 +11058,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/X86_PKG_TEMP_THERMAL #lib/modules/KVER-ipfire/build/include/config/X86_PLATFORM_DEVICES #lib/modules/KVER-ipfire/build/include/config/X86_PLATFORM_DRIVERS_DELL -#lib/modules/KVER-ipfire/build/include/config/X86_PLATFORM_DRIVERS_INTEL #lib/modules/KVER-ipfire/build/include/config/X86_PMEM_LEGACY #lib/modules/KVER-ipfire/build/include/config/X86_PMEM_LEGACY_DEVICE #lib/modules/KVER-ipfire/build/include/config/X86_PM_TIMER @@ -15949,6 +15948,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/uapi/linux/cryptouser.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cuda.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cxl_mem.h +#lib/modules/KVER-ipfire/build/include/uapi/linux/cyclades.h #lib/modules/KVER-ipfire/build/include/uapi/linux/cycx_cfm.h #lib/modules/KVER-ipfire/build/include/uapi/linux/dcbnl.h #lib/modules/KVER-ipfire/build/include/uapi/linux/dccp.h diff --git a/config/rootfiles/common/x86_64/linux-headers b/config/rootfiles/common/x86_64/linux-headers index 4ba12fb00f..ef1e1ad5b5 100644 --- a/config/rootfiles/common/x86_64/linux-headers +++ b/config/rootfiles/common/x86_64/linux-headers @@ -233,6 +233,7 @@ #usr/include/linux/cryptouser.h #usr/include/linux/cuda.h #usr/include/linux/cxl_mem.h +#usr/include/linux/cyclades.h #usr/include/linux/cycx_cfm.h #usr/include/linux/dcbnl.h #usr/include/linux/dccp.h diff --git a/lfs/linux b/lfs/linux index 2a7692b673..d681ffd2d9 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 5.15.17 -ARM_PATCHES = 5.15-ipfire3 +VER = 5.15.21 +ARM_PATCHES = 5.15-ipfire4 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -73,8 +73,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 494b21b74acf5d32d7cb80497fbff429 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = f3161c7ae52eb60e76d64ae483fe1120 +$(DL_FILE)_MD5 = 0eca0f389acdab4f6eb62ff8c1e22c18 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = cce945d8a33c9c4c4bda3ef9ad6a492b install : $(TARGET)