From 2eda35a51e1b2be0cb7e67ad37b6580e4d11b332 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 6 May 2024 18:03:05 +0200 Subject: [PATCH] kernel: update to 6.6.30 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.x86_64-ipfire | 5 +++-- config/rootfiles/common/x86_64/linux | 13 +++++++++++-- lfs/linux | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 09eaa73d9..002fb8502 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 6.6.29-ipfire Kernel Configuration +# Linux/x86 6.6.30-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -502,7 +502,7 @@ CONFIG_CALL_PADDING=y CONFIG_HAVE_CALL_THUNKS=y CONFIG_CALL_THUNKS=y CONFIG_PREFIX_SYMBOLS=y -CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_CPU_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y @@ -704,6 +704,7 @@ CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y CONFIG_AS_WRUSS=y +CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # # General architecture-dependent options diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 8458d510d..d1e5c19ae 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -6926,7 +6926,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/AQUANTIA_PHY #lib/modules/KVER-ipfire/build/include/config/AR5523 #lib/modules/KVER-ipfire/build/include/config/ARCH_CLOCKSOURCE_INIT -#lib/modules/KVER-ipfire/build/include/config/ARCH_CORRECT_STACKTRACE_ON_KRETPROBE +#lib/modules/KVER-ipfire/build/include/config/ARCH_CONFIGURES_CPU_MITIGATIONS #lib/modules/KVER-ipfire/build/include/config/ARCH_CPUIDLE_HALTPOLL #lib/modules/KVER-ipfire/build/include/config/ARCH_DMA_ADDR_T_64BIT #lib/modules/KVER-ipfire/build/include/config/ARCH_ENABLE_MEMORY_HOTPLUG @@ -7232,7 +7232,10 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/BOOT_VESA_SUPPORT #lib/modules/KVER-ipfire/build/include/config/BPF #lib/modules/KVER-ipfire/build/include/config/BPF_JIT +#lib/modules/KVER-ipfire/build/include/config/BPF_JIT_ALWAYS_ON #lib/modules/KVER-ipfire/build/include/config/BPF_JIT_DEFAULT_ON +#lib/modules/KVER-ipfire/build/include/config/BPF_SYSCALL +#lib/modules/KVER-ipfire/build/include/config/BPF_UNPRIV_DEFAULT_OFF #lib/modules/KVER-ipfire/build/include/config/BQL #lib/modules/KVER-ipfire/build/include/config/BRANCH_PROFILE_NONE #lib/modules/KVER-ipfire/build/include/config/BRCMFMAC @@ -7412,6 +7415,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CPU_IDLE_GOV_MENU #lib/modules/KVER-ipfire/build/include/config/CPU_IDLE_GOV_TEO #lib/modules/KVER-ipfire/build/include/config/CPU_ISOLATION +#lib/modules/KVER-ipfire/build/include/config/CPU_MITIGATIONS #lib/modules/KVER-ipfire/build/include/config/CPU_RMAP #lib/modules/KVER-ipfire/build/include/config/CPU_SRSO #lib/modules/KVER-ipfire/build/include/config/CPU_SUP_AMD @@ -9371,6 +9375,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/NETDEVICES #lib/modules/KVER-ipfire/build/include/config/NETFILTER #lib/modules/KVER-ipfire/build/include/config/NETFILTER_ADVANCED +#lib/modules/KVER-ipfire/build/include/config/NETFILTER_BPF_LINK #lib/modules/KVER-ipfire/build/include/config/NETFILTER_CONNCOUNT #lib/modules/KVER-ipfire/build/include/config/NETFILTER_EGRESS #lib/modules/KVER-ipfire/build/include/config/NETFILTER_FAMILY_ARP @@ -10995,7 +11000,6 @@ 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/SPECULATION_MITIGATIONS #lib/modules/KVER-ipfire/build/include/config/SPLIT_PTLOCK_CPUS #lib/modules/KVER-ipfire/build/include/config/SPMI #lib/modules/KVER-ipfire/build/include/config/SSB @@ -11065,6 +11069,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/TASKS_RCU #lib/modules/KVER-ipfire/build/include/config/TASKS_RCU_GENERIC #lib/modules/KVER-ipfire/build/include/config/TASKS_RUDE_RCU +#lib/modules/KVER-ipfire/build/include/config/TASKS_TRACE_RCU #lib/modules/KVER-ipfire/build/include/config/TASK_DELAY_ACCT #lib/modules/KVER-ipfire/build/include/config/TASK_IO_ACCOUNTING #lib/modules/KVER-ipfire/build/include/config/TASK_XACCT @@ -11746,6 +11751,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/X86_VSYSCALL_EMULATION #lib/modules/KVER-ipfire/build/include/config/X86_X2APIC #lib/modules/KVER-ipfire/build/include/config/XARRAY_MULTI +#lib/modules/KVER-ipfire/build/include/config/XDP_SOCKETS +#lib/modules/KVER-ipfire/build/include/config/XDP_SOCKETS_DIAG #lib/modules/KVER-ipfire/build/include/config/XEN #lib/modules/KVER-ipfire/build/include/config/XENFS #lib/modules/KVER-ipfire/build/include/config/XEN_512GB @@ -23490,6 +23497,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko.xz #lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko.xz #lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko.xz +#lib/modules/KVER-ipfire/kernel/net/xdp +#lib/modules/KVER-ipfire/kernel/net/xdp/xsk_diag.ko.xz #lib/modules/KVER-ipfire/kernel/net/xfrm #lib/modules/KVER-ipfire/kernel/net/xfrm/xfrm_ipcomp.ko.xz #lib/modules/KVER-ipfire/kernel/sound diff --git a/lfs/linux b/lfs/linux index c297f3358..ef6b2cd04 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.29 +VER = 6.6.30 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 9f1d24bb15d4db821f744e270f6eb24db38944afaa7ebeaba000f13e9ec7d560497608ec6e8daaf234344a510bcf1282e95dfc904c2940db4b0970479ca7deff +$(DL_FILE)_BLAKE2 = 815c85dae71784bc1eb722fc7651abebf344a960f51c473daa50f51f9097b8d64c68c033a3d488f7780cebd29e360c6df6ceff255a1a07d18533d7d950e77db8 install : $(TARGET) -- 2.39.2