linux: Update to 5.15.68

Message ID d0adcba3-3a8a-50fb-77f3-b182bf000998@ipfire.org
State Accepted
Commit ae185d6f9d0578486f9a91c5e371f159a5a41a23
Headers
Series linux: Update to 5.15.68 |

Commit Message

Peter Müller 19 Sep 2022, 12:28 p.m. UTC
  Please refer to https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.68
for the changelog of this release. Due to the lack of local build
hardware, ARM rootfile and configuration changes have been omitted.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/kernel/kernel.config.x86_64-ipfire | 11 +++++------
 config/rootfiles/common/x86_64/linux      |  6 ++++--
 lfs/linux                                 |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)
  

Comments

Michael Tremer 19 Sep 2022, 1:03 p.m. UTC | #1
Hello,

> On 19 Sep 2022, at 14:28, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Please refer to https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.68
> for the changelog of this release. Due to the lack of local build
> hardware, ARM rootfile and configuration changes have been omitted.

Get in touch with me if you need anything :)

> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> config/kernel/kernel.config.x86_64-ipfire | 11 +++++------
> config/rootfiles/common/x86_64/linux      |  6 ++++--
> lfs/linux                                 |  4 ++--
> 3 files changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
> index aa1e847dd..54e8a3ec7 100644
> --- a/config/kernel/kernel.config.x86_64-ipfire
> +++ b/config/kernel/kernel.config.x86_64-ipfire
> @@ -1,15 +1,15 @@
> #
> # Automatically generated file; DO NOT EDIT.
> -# Linux/x86 5.15.59-ipfire Kernel Configuration
> +# Linux/x86 5.15.68-ipfire Kernel Configuration
> #
> CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
> CONFIG_CC_IS_GCC=y
> CONFIG_GCC_VERSION=110300
> CONFIG_CLANG_VERSION=0
> CONFIG_AS_IS_GNU=y
> -CONFIG_AS_VERSION=23700
> +CONFIG_AS_VERSION=23900
> CONFIG_LD_IS_BFD=y
> -CONFIG_LD_VERSION=23700
> +CONFIG_LD_VERSION=23900
> CONFIG_LLD_VERSION=0
> CONFIG_CC_CAN_LINK=y
> CONFIG_CC_CAN_LINK_STATIC=y
> @@ -691,6 +691,7 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=y
> CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
> CONFIG_HAVE_NMI=y
> CONFIG_TRACE_IRQFLAGS_SUPPORT=y
> +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
> CONFIG_HAVE_ARCH_TRACEHOOK=y
> CONFIG_HAVE_DMA_CONTIGUOUS=y
> CONFIG_GENERIC_SMP_IDLE_THREAD=y
> @@ -7124,8 +7125,7 @@ CONFIG_CRYPTO_CRC32=y
> CONFIG_CRYPTO_CRC32_PCLMUL=m
> CONFIG_CRYPTO_XXHASH=m
> CONFIG_CRYPTO_BLAKE2B=m
> -# CONFIG_CRYPTO_BLAKE2S is not set
> -CONFIG_CRYPTO_BLAKE2S_X86=m
> +CONFIG_CRYPTO_BLAKE2S_X86=y
> CONFIG_CRYPTO_CRCT10DIF=y
> CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
> CONFIG_CRYPTO_GHASH=m
> @@ -7652,7 +7652,6 @@ CONFIG_IO_STRICT_DEVMEM=y
> #
> # x86 Debugging
> #
> -CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
> # CONFIG_X86_VERBOSE_BOOTUP is not set
> CONFIG_EARLY_PRINTK=y
> # CONFIG_EARLY_PRINTK_DBGP is not set
> diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
> index 99fa8ffdc..518230b39 100644
> --- a/config/rootfiles/common/x86_64/linux
> +++ b/config/rootfiles/common/x86_64/linux
> @@ -10135,7 +10135,6 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/include/config/SKY2
> #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_HARDENED
> #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_RANDOM
> -#lib/modules/KVER-ipfire/build/include/config/SLAB_MERGE_DEFAULT
> #lib/modules/KVER-ipfire/build/include/config/SLHC
> #lib/modules/KVER-ipfire/build/include/config/SLICOSS
> #lib/modules/KVER-ipfire/build/include/config/SLS
> @@ -17543,6 +17542,9 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h
> #lib/modules/KVER-ipfire/build/scripts/dtc/yamltree.c
> #lib/modules/KVER-ipfire/build/scripts/dummy-tools
> +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir
> +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include
> +#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h
> #lib/modules/KVER-ipfire/build/scripts/dummy-tools/gcc
> #lib/modules/KVER-ipfire/build/scripts/dummy-tools/ld
> #lib/modules/KVER-ipfire/build/scripts/dummy-tools/nm
> @@ -17781,6 +17783,7 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/scripts/package/mkdebian
> #lib/modules/KVER-ipfire/build/scripts/package/mkspec
> #lib/modules/KVER-ipfire/build/scripts/package/snapcraft.template
> +#lib/modules/KVER-ipfire/build/scripts/pahole-flags.sh
> #lib/modules/KVER-ipfire/build/scripts/parse-maintainers.pl
> #lib/modules/KVER-ipfire/build/scripts/patch-kernel
> #lib/modules/KVER-ipfire/build/scripts/profile2linkerlist.pl
> @@ -18724,7 +18727,6 @@ lib/modules/KVER-ipfire/kernel
> #lib/modules/KVER-ipfire/kernel/arch
> #lib/modules/KVER-ipfire/kernel/arch/x86
> #lib/modules/KVER-ipfire/kernel/arch/x86/crypto
> -#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/blake2s-x86_64.ko.xz
> #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/blowfish-x86_64.ko.xz
> #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko.xz
> #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/camellia-aesni-avx2.ko.xz
> diff --git a/lfs/linux b/lfs/linux
> index e80f99601..a1b32cc25 100644
> --- a/lfs/linux
> +++ b/lfs/linux
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER         = 5.15.59
> +VER         = 5.15.68
> ARM_PATCHES = 5.15-ipfire5
> 
> THISAPP    = linux-$(VER)
> @@ -78,7 +78,7 @@ 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)_BLAKE2 = c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b
> +$(DL_FILE)_BLAKE2 = b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4fcedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1
> arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 58a70e757a9121a0aac83604a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a86e0371a3e896f4c7cdd699c34a0
> 
> install : $(TARGET)
> -- 
> 2.35.3
  

Patch

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index aa1e847dd..54e8a3ec7 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,15 +1,15 @@ 
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.59-ipfire Kernel Configuration
+# Linux/x86 5.15.68-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=110300
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23700
+CONFIG_AS_VERSION=23900
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23700
+CONFIG_LD_VERSION=23900
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -691,6 +691,7 @@  CONFIG_HAVE_KPROBES_ON_FTRACE=y
 CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -7124,8 +7125,7 @@  CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO_BLAKE2B=m
-# CONFIG_CRYPTO_BLAKE2S is not set
-CONFIG_CRYPTO_BLAKE2S_X86=m
+CONFIG_CRYPTO_BLAKE2S_X86=y
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_GHASH=m
@@ -7652,7 +7652,6 @@  CONFIG_IO_STRICT_DEVMEM=y
 #
 # x86 Debugging
 #
-CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 99fa8ffdc..518230b39 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -10135,7 +10135,6 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/SKY2
 #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_HARDENED
 #lib/modules/KVER-ipfire/build/include/config/SLAB_FREELIST_RANDOM
-#lib/modules/KVER-ipfire/build/include/config/SLAB_MERGE_DEFAULT
 #lib/modules/KVER-ipfire/build/include/config/SLHC
 #lib/modules/KVER-ipfire/build/include/config/SLICOSS
 #lib/modules/KVER-ipfire/build/include/config/SLS
@@ -17543,6 +17542,9 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/scripts/dtc/version_gen.h
 #lib/modules/KVER-ipfire/build/scripts/dtc/yamltree.c
 #lib/modules/KVER-ipfire/build/scripts/dummy-tools
+#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir
+#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include
+#lib/modules/KVER-ipfire/build/scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h
 #lib/modules/KVER-ipfire/build/scripts/dummy-tools/gcc
 #lib/modules/KVER-ipfire/build/scripts/dummy-tools/ld
 #lib/modules/KVER-ipfire/build/scripts/dummy-tools/nm
@@ -17781,6 +17783,7 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/scripts/package/mkdebian
 #lib/modules/KVER-ipfire/build/scripts/package/mkspec
 #lib/modules/KVER-ipfire/build/scripts/package/snapcraft.template
+#lib/modules/KVER-ipfire/build/scripts/pahole-flags.sh
 #lib/modules/KVER-ipfire/build/scripts/parse-maintainers.pl
 #lib/modules/KVER-ipfire/build/scripts/patch-kernel
 #lib/modules/KVER-ipfire/build/scripts/profile2linkerlist.pl
@@ -18724,7 +18727,6 @@  lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/arch
 #lib/modules/KVER-ipfire/kernel/arch/x86
 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto
-#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/blake2s-x86_64.ko.xz
 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/blowfish-x86_64.ko.xz
 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko.xz
 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/camellia-aesni-avx2.ko.xz
diff --git a/lfs/linux b/lfs/linux
index e80f99601..a1b32cc25 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER         = 5.15.59
+VER         = 5.15.68
 ARM_PATCHES = 5.15-ipfire5
 
 THISAPP    = linux-$(VER)
@@ -78,7 +78,7 @@  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)_BLAKE2 = c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b
+$(DL_FILE)_BLAKE2 = b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4fcedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1
 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 58a70e757a9121a0aac83604a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a86e0371a3e896f4c7cdd699c34a0
 
 install : $(TARGET)