From 44b227b102964e520369d8628db342e68551966f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 14 Nov 2019 22:12:12 +0100 Subject: [PATCH] kernel: update to 4.14.154 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.aarch64-ipfire | 4 +++- config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 3 ++- config/kernel/kernel.config.armv5tel-ipfire-multi | 3 ++- config/kernel/kernel.config.i586-ipfire | 6 +++++- config/kernel/kernel.config.i586-ipfire-pae | 6 +++++- config/kernel/kernel.config.x86_64-ipfire | 6 +++++- config/rootfiles/common/aarch64/linux | 2 ++ config/rootfiles/common/armv5tel/linux-kirkwood | 2 ++ config/rootfiles/common/armv5tel/linux-multi | 2 ++ config/rootfiles/common/i586/linux | 10 +++++----- config/rootfiles/common/x86_64/linux | 10 +++++----- config/rootfiles/packages/linux-pae | 10 +++++----- lfs/linux | 10 +++++----- 13 files changed, 48 insertions(+), 26 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 778b05a9ab..e79403bc77 100644 --- 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 fcbac3bcda..2bfb7ff36a 100644 --- 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 fc74eb142d..7e9de39eaa 100644 --- 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 4eaae6f740..2732bba422 100644 --- 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 526adbbcb9..9b53ab35c3 100644 --- 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 c9563234ea..2fcf1e589d 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 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 d8e93542db..f9dc8555b5 100644 --- 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 2269896d86..9ccc006b9c 100644 --- 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 1e7a090d94..890e3be216 100644 --- 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 1fe01233f2..684dbe07bd 100644 --- 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 68f907faa2..f44266e52c 100644 --- 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 f3966ce757..c0894cd1fa 100644 --- 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 c8bcdbb978..aac2c48686 100644 --- 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) -- 2.39.2