kernel: arm rootfile update

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

diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 34a347e1eb6012666ce8deea7981e1669a4f29d9..2f8a3fd8252a6e432aaf1af87ca7f05f9d60d812 100644 (file)
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -818,6 +818,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vdso/gettimeofday.h
 #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vdso/processor.h
 #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vdso/vsyscall.h
+#lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vectors.h
 #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vermagic.h
 #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/virt.h
 #lib/modules/KVER-ipfire/build/arch/arm64/include/asm/vmalloc.h
@@ -6427,7 +6428,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_DMA_PREP_COHERENT
 #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_ELF_RANDOMIZE
 #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_FAST_MULTIPLIER
-#lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_FILTER_PGPROT
 #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_FORTIFY_SOURCE
 #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_GCOV_PROFILE_ALL
 #lib/modules/KVER-ipfire/build/include/config/ARCH_HAS_GIGANTIC_PAGE
@@ -8504,6 +8504,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX
 #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX_PCI
 #lib/modules/KVER-ipfire/build/include/config/MISC_RTSX_USB
+#lib/modules/KVER-ipfire/build/include/config/MITIGATE_SPECTRE_BRANCH_HISTORY
 #lib/modules/KVER-ipfire/build/include/config/MLX4_CORE
 #lib/modules/KVER-ipfire/build/include/config/MLX4_CORE_GEN2
 #lib/modules/KVER-ipfire/build/include/config/MLX4_DEBUG
@@ -9184,7 +9185,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/OF_IRQ
 #lib/modules/KVER-ipfire/build/include/config/OF_KOBJ
 #lib/modules/KVER-ipfire/build/include/config/OF_MDIO
-#lib/modules/KVER-ipfire/build/include/config/OF_NET
 #lib/modules/KVER-ipfire/build/include/config/OF_OVERLAY
 #lib/modules/KVER-ipfire/build/include/config/OF_RESERVED_MEM
 #lib/modules/KVER-ipfire/build/include/config/OF_RESOLVE

diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/armv6l/linux
index fd85de41b6ed2f159779f3b4170dc957d6246915..55cdefc160d804f08157e9334bcdd86daeaa5f0a 100644 (file)
--- a/config/rootfiles/common/armv6l/linux
+++ b/config/rootfiles/common/armv6l/linux
@@ -450,6 +450,7 @@ boot/dtb-KVER-ipfire
 #boot/dtb-KVER-ipfire/meson8b-mxq.dtb
 #boot/dtb-KVER-ipfire/meson8b-odroidc1.dtb
 #boot/dtb-KVER-ipfire/meson8m2-mxiii-plus.dtb
+#boot/dtb-KVER-ipfire/omap3-beagle-ab4.dtb
 #boot/dtb-KVER-ipfire/omap3-beagle-xm-ab.dtb
 #boot/dtb-KVER-ipfire/omap3-beagle-xm.dtb
 #boot/dtb-KVER-ipfire/omap3-beagle.dtb
@@ -946,6 +947,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/arch/arm/include/asm/smp_scu.h
 #lib/modules/KVER-ipfire/build/arch/arm/include/asm/smp_twd.h
 #lib/modules/KVER-ipfire/build/arch/arm/include/asm/sparsemem.h
+#lib/modules/KVER-ipfire/build/arch/arm/include/asm/spectre.h
 #lib/modules/KVER-ipfire/build/arch/arm/include/asm/spinlock.h
 #lib/modules/KVER-ipfire/build/arch/arm/include/asm/spinlock_types.h
 #lib/modules/KVER-ipfire/build/arch/arm/include/asm/stackprotector.h
@@ -8080,6 +8082,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/GENERIC_CLOCKEVENTS
 #lib/modules/KVER-ipfire/build/include/config/GENERIC_CLOCKEVENTS_BROADCAST
 #lib/modules/KVER-ipfire/build/include/config/GENERIC_CPU_AUTOPROBE
+#lib/modules/KVER-ipfire/build/include/config/GENERIC_CPU_VULNERABILITIES
 #lib/modules/KVER-ipfire/build/include/config/GENERIC_EARLY_IOREMAP
 #lib/modules/KVER-ipfire/build/include/config/GENERIC_GETTIMEOFDAY
 #lib/modules/KVER-ipfire/build/include/config/GENERIC_HWEIGHT
@@ -8142,6 +8145,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/HARDENED_USERCOPY
 #lib/modules/KVER-ipfire/build/include/config/HARDENED_USERCOPY_FALLBACK
 #lib/modules/KVER-ipfire/build/include/config/HARDENED_USERCOPY_PAGESPAN
+#lib/modules/KVER-ipfire/build/include/config/HARDEN_BRANCH_HISTORY
 #lib/modules/KVER-ipfire/build/include/config/HARDEN_BRANCH_PREDICTOR
 #lib/modules/KVER-ipfire/build/include/config/HARDIRQS_SW_RESEND
 #lib/modules/KVER-ipfire/build/include/config/HAS_DMA
@@ -9581,7 +9585,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/OF_IRQ
 #lib/modules/KVER-ipfire/build/include/config/OF_KOBJ
 #lib/modules/KVER-ipfire/build/include/config/OF_MDIO
-#lib/modules/KVER-ipfire/build/include/config/OF_NET
 #lib/modules/KVER-ipfire/build/include/config/OF_OVERLAY
 #lib/modules/KVER-ipfire/build/include/config/OF_RESERVED_MEM
 #lib/modules/KVER-ipfire/build/include/config/OF_RESOLVE