kernel: update to 4.14.154

[ipfire-2.x.git] / config / rootfiles / common / i586 / linux

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