kernel: update to 6.6.26

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 6552e2a6415bda36211392b8ede4232d6076778b..1689aaea80e7e0b35ef5c5b63c716f947989b697 100644 (file)
--- 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 6.6.25-ipfire Kernel Configuration
+# Linux/arm64 6.6.26-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.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 5ecc7f15b99a258689dad44214fa91e39dc18485..edecade1d12af3472a51f8c78479c0292430dc15 100644 (file)
--- 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 6.6.25-ipfire Kernel Configuration
+# Linux/x86 6.6.26-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -510,6 +510,9 @@ CONFIG_CPU_SRSO=y
 CONFIG_SLS=y
 # CONFIG_GDS_FORCE_MITIGATION is not set
 CONFIG_MITIGATION_RFDS=y
+# CONFIG_SPECTRE_BHI_ON is not set
+# CONFIG_SPECTRE_BHI_OFF is not set
+CONFIG_SPECTRE_BHI_AUTO=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #

diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index e74e1f98c23f221df6e259d0628ac12d4b6dadd4..5b4599c617e6d68e4a1beb106eeb85ea48832980 100644 (file)
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -10995,6 +10995,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP
 #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP_ENABLE
 #lib/modules/KVER-ipfire/build/include/config/SPARSE_IRQ
+#lib/modules/KVER-ipfire/build/include/config/SPECTRE_BHI_AUTO
 #lib/modules/KVER-ipfire/build/include/config/SPECULATION_MITIGATIONS
 #lib/modules/KVER-ipfire/build/include/config/SPLIT_PTLOCK_CPUS
 #lib/modules/KVER-ipfire/build/include/config/SPMI
@@ -18938,6 +18939,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/scripts/mod/modpost.c
 #lib/modules/KVER-ipfire/build/scripts/mod/modpost.h
 #lib/modules/KVER-ipfire/build/scripts/mod/sumversion.c
+#lib/modules/KVER-ipfire/build/scripts/mod/symsearch.c
 #lib/modules/KVER-ipfire/build/scripts/module.lds
 #lib/modules/KVER-ipfire/build/scripts/module.lds.S
 #lib/modules/KVER-ipfire/build/scripts/modules-check.sh

diff --git a/lfs/linux b/lfs/linux
index e10ce532aa3fb7a6f61c60222db53656ee95407a..f01c5101fd387cb29342d7e5f4b21d03ee04c115 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER         = 6.6.25
+VER         = 6.6.26
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -72,7 +72,7 @@ objects = \
 
 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = d744ef7ea55202d5cb9adad2d7b22bc8be81bb4b5a03fe52e063192557eadf28d5e62612b6a517ec3180441d8fcec3582a53383df644c32bb45f3e969298af56
+$(DL_FILE)_BLAKE2 = 633ef0a386e6877811466c9ac937440709ec878b6ed4d26df874d524d9d6e3d92e0d73a6916bade1fffe297345e72253274fd57ccbab5addd461e10569bc702d
 
 install : $(TARGET)
 
@@ -109,7 +109,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -svf linux-$(VER) $(DIR_SRC)/linux
 
        # Layer7-patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.6-layer7.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.6.26-layer7.patch
 
        # DVB Patches
        cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch

diff --git a/src/patches/linux/linux-6.6-layer7.patch b/src/patches/linux/linux-6.6.26-layer7.patch
similarity index 99%
rename from src/patches/linux/linux-6.6-layer7.patch
rename to src/patches/linux/linux-6.6.26-layer7.patch
index 571ea7af1b0ada5d531d8beebfa06419d93e6141..967598a5b093da4eefe6c6a3f40f73af8b2d14d6 100644 (file)
--- a/src/patches/linux/linux-6.6-layer7.patch
+++ b/src/patches/linux/linux-6.6.26-layer7.patch
@@ -1,8 +1,8 @@
 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index 97bfef071255..b41174c29ca0 100644
+index 9e61f6df6bc5..f781cbe021f9 100644
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -890,6 +890,9 @@ struct sk_buff {
+@@ -885,6 +885,9 @@ struct sk_buff {
  
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        unsigned long            _nfct;
@@ -103,7 +103,7 @@ index d4958e7e7631..eea1eb1206fa 100644
  obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
-index 9f6f2e643575..ea2fb2889155 100644
+index e4ae2a08da6a..f694cb91f176 100644
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
 @@ -592,6 +592,11 @@ void nf_ct_destroy(struct nf_conntrack *nfct)