kernel: update to 4.14.154

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 778b05a9abc931e0bd8f9cbaa11bd26d27205e74..e79403bc77812e09151b734f069e94f414da75aa 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 4.14.150-ipfire Kernel Configuration
+# Linux/arm64 4.14.154-ipfire Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -1456,6 +1456,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -6822,6 +6823,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
+CONFIG_SGL_ALLOC=y
 # CONFIG_DMA_NOOP_OPS is not set
 # CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CPU_RMAP=y

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index fcbac3bcda113a88c004c294e35f48ac5e373ec1..2bfb7ff36acb39b1cc09a68f70ab970047d08fbe 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.150-ipfire-kirkwood Kernel Configuration
+# Linux/arm 4.14.154-ipfire-kirkwood Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -6235,6 +6235,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
+CONFIG_SGL_ALLOC=y
 # CONFIG_DMA_NOOP_OPS is not set
 # CONFIG_DMA_VIRT_OPS is not set
 CONFIG_DQL=y

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index fc74eb142d42f494dfbea86abf4161566ab730f7..7e9de39eaa7d68ac369037bf0f27ca6703a20c9b 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.150-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.154-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -7318,6 +7318,7 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
+CONFIG_SGL_ALLOC=y
 # CONFIG_DMA_NOOP_OPS is not set
 # CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CPU_RMAP=y

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 4eaae6f7403970234c85caf7ab677d87210bccdd..2732bba42207c45f393352907801d10a2902894c 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.150-ipfire Kernel Configuration
+# Linux/x86 4.14.154-ipfire-pae Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -601,6 +601,9 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
@@ -7024,6 +7027,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
+CONFIG_SGL_ALLOC=y
 # CONFIG_DMA_NOOP_OPS is not set
 # CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CHECK_SIGNATURE=y

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 526adbbcb95a3cd4e20eb4c50b7bb3ef23cce9b0..9b53ab35c3a4001fbf33520d975bb527ea0fc915 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.150-ipfire-pae Kernel Configuration
+# Linux/x86 4.14.154-ipfire-pae Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -619,6 +619,9 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
@@ -7029,6 +7032,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
+CONFIG_SGL_ALLOC=y
 # CONFIG_DMA_NOOP_OPS is not set
 # CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CHECK_SIGNATURE=y

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index c9563234ea9d4ba5afcb2dc1a3061ef03c1865c4..2fcf1e589df219ee9283a43ae053c187d88ace4b 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 4.14.150-ipfire Kernel Configuration
+# Linux/x86 4.14.154-ipfire Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -611,6 +611,9 @@ CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
 # CONFIG_X86_INTEL_MPX is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_MIXED=y
@@ -6909,6 +6912,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
+CONFIG_SGL_ALLOC=y
 # CONFIG_DMA_NOOP_OPS is not set
 # CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CHECK_SIGNATURE=y

diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index d8e93542db9c0d372cd5c3c1d2145db602c9a4dd..f9dc8555b5fa2297cf8c3721b78fa48dbe57ca37 100644 (file)
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -9821,6 +9821,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/sg/pool.h
 #lib/modules/KVER-ipfire/build/include/config/sgetmask
 #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h
+#lib/modules/KVER-ipfire/build/include/config/sgl
+#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h
 #lib/modules/KVER-ipfire/build/include/config/shmem.h
 #lib/modules/KVER-ipfire/build/include/config/signalfd.h
 #lib/modules/KVER-ipfire/build/include/config/simple

diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood
index 2269896d86790781c995647dd08a3a6c1acd3470..9ccc006b9c1db4e00be15d91701ce53db9f4f978 100644 (file)
--- a/config/rootfiles/common/armv5tel/linux-kirkwood
+++ b/config/rootfiles/common/armv5tel/linux-kirkwood
@@ -9329,6 +9329,8 @@ boot/vmlinuz-KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/build/include/config/sg/pool.h
 #lib/modules/KVER-ipfire-kirkwood/build/include/config/sgetmask
 #lib/modules/KVER-ipfire-kirkwood/build/include/config/sgetmask/syscall.h
+#lib/modules/KVER-ipfire-kirkwood/build/include/config/sgl
+#lib/modules/KVER-ipfire-kirkwood/build/include/config/sgl/alloc.h
 #lib/modules/KVER-ipfire-kirkwood/build/include/config/shmem.h
 #lib/modules/KVER-ipfire-kirkwood/build/include/config/signalfd.h
 #lib/modules/KVER-ipfire-kirkwood/build/include/config/simple

diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi
index 1e7a090d942fa871e72fc582b2d720c6d937cb70..890e3be216b5b8404ea014d9e68562a8d9e4f96b 100644 (file)
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -10752,6 +10752,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire-multi/build/include/config/sg/pool.h
 #lib/modules/KVER-ipfire-multi/build/include/config/sgetmask
 #lib/modules/KVER-ipfire-multi/build/include/config/sgetmask/syscall.h
+#lib/modules/KVER-ipfire-multi/build/include/config/sgl
+#lib/modules/KVER-ipfire-multi/build/include/config/sgl/alloc.h
 #lib/modules/KVER-ipfire-multi/build/include/config/shmem.h
 #lib/modules/KVER-ipfire-multi/build/include/config/signalfd.h
 #lib/modules/KVER-ipfire-multi/build/include/config/simple

diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 1fe01233f27bea0a6146ce8df58922199fae4471..684dbe07bdd536abe3719d71d45276d060e11890 100644 (file)
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -10838,6 +10838,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/sg/pool.h
 #lib/modules/KVER-ipfire/build/include/config/sgetmask
 #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h
+#lib/modules/KVER-ipfire/build/include/config/sgl
+#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h
 #lib/modules/KVER-ipfire/build/include/config/shmem.h
 #lib/modules/KVER-ipfire/build/include/config/signalfd.h
 #lib/modules/KVER-ipfire/build/include/config/sis190.h
@@ -12164,6 +12166,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/x86/intel/mid.h
 #lib/modules/KVER-ipfire/build/include/config/x86/intel/pstate.h
 #lib/modules/KVER-ipfire/build/include/config/x86/intel/quark.h
+#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx
+#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode
+#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/off.h
 #lib/modules/KVER-ipfire/build/include/config/x86/intel/usercopy.h
 #lib/modules/KVER-ipfire/build/include/config/x86/internode
 #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache
@@ -14027,7 +14032,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/linux/net.h
 #lib/modules/KVER-ipfire/build/include/linux/netdev_features.h
 #lib/modules/KVER-ipfire/build/include/linux/netdevice.h
-#lib/modules/KVER-ipfire/build/include/linux/netdevice.h.orig
 #lib/modules/KVER-ipfire/build/include/linux/netfilter
 #lib/modules/KVER-ipfire/build/include/linux/netfilter.h
 #lib/modules/KVER-ipfire/build/include/linux/netfilter/ipset
@@ -14773,7 +14777,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/linux/sizes.h
 #lib/modules/KVER-ipfire/build/include/linux/skb_array.h
 #lib/modules/KVER-ipfire/build/include/linux/skbuff.h
-#lib/modules/KVER-ipfire/build/include/linux/skbuff.h.orig
 #lib/modules/KVER-ipfire/build/include/linux/slab.h
 #lib/modules/KVER-ipfire/build/include/linux/slab_def.h
 #lib/modules/KVER-ipfire/build/include/linux/slub_def.h
@@ -15587,7 +15590,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/net/route.h
 #lib/modules/KVER-ipfire/build/include/net/rtnetlink.h
 #lib/modules/KVER-ipfire/build/include/net/sch_generic.h
-#lib/modules/KVER-ipfire/build/include/net/sch_generic.h.orig
 #lib/modules/KVER-ipfire/build/include/net/scm.h
 #lib/modules/KVER-ipfire/build/include/net/sctp
 #lib/modules/KVER-ipfire/build/include/net/sctp/auth.h
@@ -17242,9 +17244,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/net/ncsi/Makefile
 #lib/modules/KVER-ipfire/build/net/netfilter
 #lib/modules/KVER-ipfire/build/net/netfilter/Kconfig
-#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig.orig
 #lib/modules/KVER-ipfire/build/net/netfilter/Makefile
-#lib/modules/KVER-ipfire/build/net/netfilter/Makefile.orig
 #lib/modules/KVER-ipfire/build/net/netfilter/ipset
 #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Kconfig
 #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Makefile

diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 68f907faa2a6961fc9143251ea1add14f30be02e..f44266e52c50b6fe4fc239147553cbb2823c6323 100644 (file)
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -10850,6 +10850,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/sg/pool.h
 #lib/modules/KVER-ipfire/build/include/config/sgetmask
 #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h
+#lib/modules/KVER-ipfire/build/include/config/sgl
+#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h
 #lib/modules/KVER-ipfire/build/include/config/shmem.h
 #lib/modules/KVER-ipfire/build/include/config/signalfd.h
 #lib/modules/KVER-ipfire/build/include/config/sis190.h
@@ -12122,6 +12124,9 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/x86/intel/memory/protection
 #lib/modules/KVER-ipfire/build/include/config/x86/intel/memory/protection/keys.h
 #lib/modules/KVER-ipfire/build/include/config/x86/intel/pstate.h
+#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx
+#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode
+#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/auto.h
 #lib/modules/KVER-ipfire/build/include/config/x86/internode
 #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache
 #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache/shift.h
@@ -14042,7 +14047,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/linux/net.h
 #lib/modules/KVER-ipfire/build/include/linux/netdev_features.h
 #lib/modules/KVER-ipfire/build/include/linux/netdevice.h
-#lib/modules/KVER-ipfire/build/include/linux/netdevice.h.orig
 #lib/modules/KVER-ipfire/build/include/linux/netfilter
 #lib/modules/KVER-ipfire/build/include/linux/netfilter.h
 #lib/modules/KVER-ipfire/build/include/linux/netfilter/ipset
@@ -14788,7 +14792,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/linux/sizes.h
 #lib/modules/KVER-ipfire/build/include/linux/skb_array.h
 #lib/modules/KVER-ipfire/build/include/linux/skbuff.h
-#lib/modules/KVER-ipfire/build/include/linux/skbuff.h.orig
 #lib/modules/KVER-ipfire/build/include/linux/slab.h
 #lib/modules/KVER-ipfire/build/include/linux/slab_def.h
 #lib/modules/KVER-ipfire/build/include/linux/slub_def.h
@@ -15602,7 +15605,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/net/route.h
 #lib/modules/KVER-ipfire/build/include/net/rtnetlink.h
 #lib/modules/KVER-ipfire/build/include/net/sch_generic.h
-#lib/modules/KVER-ipfire/build/include/net/sch_generic.h.orig
 #lib/modules/KVER-ipfire/build/include/net/scm.h
 #lib/modules/KVER-ipfire/build/include/net/sctp
 #lib/modules/KVER-ipfire/build/include/net/sctp/auth.h
@@ -17257,9 +17259,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/net/ncsi/Makefile
 #lib/modules/KVER-ipfire/build/net/netfilter
 #lib/modules/KVER-ipfire/build/net/netfilter/Kconfig
-#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig.orig
 #lib/modules/KVER-ipfire/build/net/netfilter/Makefile
-#lib/modules/KVER-ipfire/build/net/netfilter/Makefile.orig
 #lib/modules/KVER-ipfire/build/net/netfilter/ipset
 #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Kconfig
 #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Makefile

diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index f3966ce757d56cd2b9edca84aa08dca606b70ae5..c0894cd1fa1e2ca5050d28624742e53964b435b2 100644 (file)
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -10836,6 +10836,8 @@ boot/vmlinuz-KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/build/include/config/sg/pool.h
 #lib/modules/KVER-ipfire-pae/build/include/config/sgetmask
 #lib/modules/KVER-ipfire-pae/build/include/config/sgetmask/syscall.h
+#lib/modules/KVER-ipfire-pae/build/include/config/sgl
+#lib/modules/KVER-ipfire-pae/build/include/config/sgl/alloc.h
 #lib/modules/KVER-ipfire-pae/build/include/config/shmem.h
 #lib/modules/KVER-ipfire-pae/build/include/config/signalfd.h
 #lib/modules/KVER-ipfire-pae/build/include/config/sis190.h
@@ -12164,6 +12166,9 @@ boot/vmlinuz-KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/lpss.h
 #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/pstate.h
 #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/quark.h
+#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx
+#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx/mode
+#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx/mode/off.h
 #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/usercopy.h
 #lib/modules/KVER-ipfire-pae/build/include/config/x86/internode
 #lib/modules/KVER-ipfire-pae/build/include/config/x86/internode/cache
@@ -14097,7 +14102,6 @@ boot/vmlinuz-KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/build/include/linux/net.h
 #lib/modules/KVER-ipfire-pae/build/include/linux/netdev_features.h
 #lib/modules/KVER-ipfire-pae/build/include/linux/netdevice.h
-#lib/modules/KVER-ipfire-pae/build/include/linux/netdevice.h.orig
 #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter
 #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter.h
 #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter/ipset
@@ -14843,7 +14847,6 @@ boot/vmlinuz-KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/build/include/linux/sizes.h
 #lib/modules/KVER-ipfire-pae/build/include/linux/skb_array.h
 #lib/modules/KVER-ipfire-pae/build/include/linux/skbuff.h
-#lib/modules/KVER-ipfire-pae/build/include/linux/skbuff.h.orig
 #lib/modules/KVER-ipfire-pae/build/include/linux/slab.h
 #lib/modules/KVER-ipfire-pae/build/include/linux/slab_def.h
 #lib/modules/KVER-ipfire-pae/build/include/linux/slub_def.h
@@ -15657,7 +15660,6 @@ boot/vmlinuz-KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/build/include/net/route.h
 #lib/modules/KVER-ipfire-pae/build/include/net/rtnetlink.h
 #lib/modules/KVER-ipfire-pae/build/include/net/sch_generic.h
-#lib/modules/KVER-ipfire-pae/build/include/net/sch_generic.h.orig
 #lib/modules/KVER-ipfire-pae/build/include/net/scm.h
 #lib/modules/KVER-ipfire-pae/build/include/net/sctp
 #lib/modules/KVER-ipfire-pae/build/include/net/sctp/auth.h
@@ -17312,9 +17314,7 @@ boot/vmlinuz-KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/build/net/ncsi/Makefile
 #lib/modules/KVER-ipfire-pae/build/net/netfilter
 #lib/modules/KVER-ipfire-pae/build/net/netfilter/Kconfig
-#lib/modules/KVER-ipfire-pae/build/net/netfilter/Kconfig.orig
 #lib/modules/KVER-ipfire-pae/build/net/netfilter/Makefile
-#lib/modules/KVER-ipfire-pae/build/net/netfilter/Makefile.orig
 #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset
 #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset/Kconfig
 #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset/Makefile

diff --git a/lfs/linux b/lfs/linux
index c8bcdbb97861a02a631dcf5a7c66ed6eea9ffcb3..aac2c48686bf37c1e2d39eb1586eb0dcf28f455e 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.150
-ARM_PATCHES = 4.14.150-ipfire0
+VER         = 4.14.154
+ARM_PATCHES = 4.14.154-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 88
+PAK_VER    = 89
 DEPS      = ""
 
 HEADERS_ARCH  = $(BUILD_PLATFORM)
@@ -82,8 +82,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                                 = 61358e7be9bfc17adb4c418355d957db
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = e4931541ffe21dd29ca2447620de6693
+$(DL_FILE)_MD5                                 = d6cf4b51c1cd10bc48bac50f4557a0d9
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 539737e07e5634565b3f4f1b932c269b
 
 install : $(TARGET)