main/linux-lts: upgrade to 5.4.7

backport all changes from edge version 5.4.7

10 files changed, 66 insertions, 36 deletions

diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index b3b33dbfb1..0ed2816242 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=lts
 pkgname=linux-${_flavor}
-pkgver=5.4.6
+pkgver=5.4.7
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -220,13 +220,13 @@ _dev() {
 }
 
 sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-7004ff9751659a697798fc8f1dc64f72ed8d9b450421106b857c68dafc1fedc41f892e48ff385b444b892c40cdabd14ff9fc6b0a17428fc4194173c421dbc371  config-lts.aarch64
-34034065cff1f6d7b85dadd125f882d97441bd4be1aa736c65553e2d9b9916760429c83bc1f56b6947f6df17d501414efb33cb8048d430e9b7f2688f3d627e11  config-lts.armv7
-0ed795888f504fb8145cb4d2926dc2b2789406fa545b246e9ad32b6f41234f44614a19db109ac13135685e9dd8570dea11e60b356aa6d5bfa7b19c7b8b54c525  config-lts.x86
-789edc77c2e0ee1712a237703d529094f5cb5e07b7efb8c2263cd08f732095a3f59e4569fe94dddb1fa5672992d082b3322e53a493575b35812474091aa0fce0  config-lts.x86_64
-ea55a95e6cfd46a9dba9b1cffa8e1314df92b5f3168f742e615f6e48517aa91a8f5cf1bf341f03268946303495832c8d14901efc2d14963639351ea166a8bba8  config-lts.ppc64le
-8203a703f4c1de28fbf4ee97b0b29379606472a43c31db72a3d88140d1e9980fab8cc212e30054b0e0cd4a551f7d842323fce203ec1c37485f77140f2f1eeb30  config-lts.s390x
-063eb7b41acddf6f57b4254bfdef926d7029c86e5b759018215d30b6fb40f36e9a422c22ff004ec1aaa7462fc0a7ca4a9c0ff7afe98fc91df174a1d04b20565c  config-virt.aarch64
-51055050d99cb0a7bb5b597016fcfaed563cb82cd54ae82adc1ab79f5af1d5b99568270867c2a512cf65469f3b8f5b6f801dd05c9d15eb3cb6978ba2eb09a0bf  config-virt.x86
-819bb70494b2a368cff56cf8ac70bd5803d620114178e2478c50febe792ac4a5a81a4b4e6cdf3317e66c3da10823589848a1f1381072e6b27d7ce5807ac10f72  config-virt.x86_64
-6f6d73c7ce71d47e810847149f4c258f5fb99c98fc67d385a3ff74889543a415bf8bb77c748a13f72b733bca770773731d84713a9be98d630b7377a792f11f5a  patch-5.4.6.xz"
+e44718f77a5817daf155d5ba1cab5a2ab1afce485e42164637254d320fadc28a8122f206e57d33e8180740421c88d358bba3d52e4d59deacc16db07626514515  config-lts.aarch64
+e4840371da27c28a67febbf6a91921098b0b55dfbf276bc744dc0fec93a7ba627f33e070f4a80156a07018002ff59ad00e67dfe2066511bccd33f1b34f718d42  config-lts.armv7
+51d6512906def6c75147658c22513469089cfb1d65a095cff0d3630810920dbdf33d022ede131ba91536de4b71550acebe9666e4e94a0a9909f1c9a7223551e4  config-lts.x86
+ace6e5f807ab94a54b3eaeff45d6745a89d42480efb3d169a1183f2b20398e91964d0400327264f1fdfa0a58a5210b197115126100c526b512e138a46cba8ddf  config-lts.x86_64
+dc5391cdd2301717a2286d3a3c8582cde401e937f162201a2f70d2ce8c6c2b7da8b3e7ddb5146eeb9bf3bf40d64d7fa1297cc9475915ee02d68b14bfbb21902a  config-lts.ppc64le
+113abc4713314defe00d05ecd509db2d0cc53ca105ab4a9ab4d4fa16da8a39edb68d6c1c63b377f5bfa7610c686fe0017798fa70a5f9435afb215888c9be52bc  config-lts.s390x
+8f13fd5e2a30b98a4718f75221d6fe13c434cbcde432ad1aab0a8bf85937ee0038f5735ba741a670b94ec680fbce4728eeaf8935af4dd6b14722338446903288  config-virt.aarch64
+d948391ff437a030ce30f795983748f9eb876b0405d3ef6728590a69adc2a77c9182d39477854be268458d583b8bc34c48fec8bd38502f57f3d02b49c3c9bb36  config-virt.x86
+0926abbfeffb4bd532cdfd941cd771460fa0bb9f7a7612bac171a6448fccaa094c5ee9fcfe075076f3bd53b0c437d766e699bb96258cf2f80c40fe0c8d66dd94  config-virt.x86_64
+396eaf9fe88045e6e308cbe8e72217b3334b637bfa7e85f8d27cc4dd8e3d94c6f58d2b7b3e237defcf647d500610b85780ec2e21f1d91ac41c5f4ef3e74dc161  patch-5.4.7.xz"
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/config-lts.aarch64
index a16974aa3a..1a31a7bb97 100644
--- a/main/linux-lts/config-lts.aarch64
+++ b/main/linux-lts/config-lts.aarch64
@@ -1145,6 +1145,8 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+# CONFIG_NFT_FIB_INET is not set
 # CONFIG_NFT_XFRM is not set
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
@@ -1153,6 +1155,7 @@ CONFIG_NFT_TPROXY=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+# CONFIG_NFT_FIB_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1322,7 +1325,7 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1363,7 +1366,7 @@ CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -6214,7 +6217,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
+CONFIG_HID_UCLOGIC=m
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
 # CONFIG_HID_GYRATION is not set
diff --git a/main/linux-lts/config-lts.armv7 b/main/linux-lts/config-lts.armv7
index 523aa97e5a..ce99494be6 100644
--- a/main/linux-lts/config-lts.armv7
+++ b/main/linux-lts/config-lts.armv7
@@ -5232,7 +5232,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
+CONFIG_HID_UCLOGIC=m
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
 # CONFIG_HID_GYRATION is not set
diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le
index 5ff89a23d8..dea1bd6a2b 100644
--- a/main/linux-lts/config-lts.ppc64le
+++ b/main/linux-lts/config-lts.ppc64le
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.5 Kernel Configuration
+# Linux/powerpc 5.4.7 Kernel Configuration
 #
 
 #
@@ -403,6 +403,7 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
 CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_MPROFILE_KERNEL=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -490,6 +491,7 @@ CONFIG_KVM_XIVE=y
 CONFIG_VHOST_NET=m
 CONFIG_VHOST=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_HAVE_LIVEPATCH=y
 
 #
 # General architecture-dependent options
@@ -536,7 +538,10 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
 CONFIG_ARCH_HAS_SCALED_CPUTIME=y
@@ -893,6 +898,8 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+# CONFIG_NFT_FIB_INET is not set
 # CONFIG_NFT_XFRM is not set
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
@@ -901,6 +908,7 @@ CONFIG_NFT_TPROXY=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+# CONFIG_NFT_FIB_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1066,9 +1074,9 @@ CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
-# CONFIG_NFT_DUP_IPV4 is not set
-# CONFIG_NFT_FIB_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1107,8 +1115,8 @@ CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
-# CONFIG_NFT_DUP_IPV6 is not set
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -3141,7 +3149,7 @@ CONFIG_HID_EZKEY=m
 # CONFIG_HID_GT683R is not set
 # CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
+CONFIG_HID_UCLOGIC=m
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
 CONFIG_HID_GYRATION=m
@@ -4499,6 +4507,7 @@ CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
diff --git a/main/linux-lts/config-lts.s390x b/main/linux-lts/config-lts.s390x
index 8066feb81e..c4b3cf1756 100644
--- a/main/linux-lts/config-lts.s390x
+++ b/main/linux-lts/config-lts.s390x
@@ -879,6 +879,8 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+# CONFIG_NFT_FIB_INET is not set
 # CONFIG_NFT_XFRM is not set
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
@@ -887,6 +889,7 @@ CONFIG_NFT_TPROXY=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+# CONFIG_NFT_FIB_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1055,7 +1058,7 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1096,7 +1099,7 @@ CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
diff --git a/main/linux-lts/config-lts.x86 b/main/linux-lts/config-lts.x86
index cd4aac6704..3224367370 100644
--- a/main/linux-lts/config-lts.x86
+++ b/main/linux-lts/config-lts.x86
@@ -1105,6 +1105,8 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+# CONFIG_NFT_FIB_INET is not set
 # CONFIG_NFT_XFRM is not set
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
@@ -1113,6 +1115,7 @@ CONFIG_NFT_TPROXY=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+# CONFIG_NFT_FIB_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1282,7 +1285,7 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1323,7 +1326,7 @@ CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -6059,7 +6062,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
+CONFIG_HID_UCLOGIC=m
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
 # CONFIG_HID_GYRATION is not set
diff --git a/main/linux-lts/config-lts.x86_64 b/main/linux-lts/config-lts.x86_64
index 0257d40f44..d72f5522ef 100644
--- a/main/linux-lts/config-lts.x86_64
+++ b/main/linux-lts/config-lts.x86_64
@@ -1156,6 +1156,8 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+# CONFIG_NFT_FIB_INET is not set
 # CONFIG_NFT_XFRM is not set
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
@@ -1164,6 +1166,7 @@ CONFIG_NFT_TPROXY=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+# CONFIG_NFT_FIB_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1333,7 +1336,7 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1374,7 +1377,7 @@ CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -6086,7 +6089,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
+CONFIG_HID_UCLOGIC=m
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
 # CONFIG_HID_GYRATION is not set
diff --git a/main/linux-lts/config-virt.aarch64 b/main/linux-lts/config-virt.aarch64
index 548d5e7d5d..9693471db4 100644
--- a/main/linux-lts/config-virt.aarch64
+++ b/main/linux-lts/config-virt.aarch64
@@ -1101,6 +1101,8 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+# CONFIG_NFT_FIB_INET is not set
 # CONFIG_NFT_XFRM is not set
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
@@ -1109,6 +1111,7 @@ CONFIG_NFT_TPROXY=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+# CONFIG_NFT_FIB_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1277,7 +1280,7 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1317,7 +1320,7 @@ CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
diff --git a/main/linux-lts/config-virt.x86 b/main/linux-lts/config-virt.x86
index 3ea5f280be..d38c0f45b6 100644
--- a/main/linux-lts/config-virt.x86
+++ b/main/linux-lts/config-virt.x86
@@ -1057,6 +1057,8 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+# CONFIG_NFT_FIB_INET is not set
 # CONFIG_NFT_XFRM is not set
 # CONFIG_NFT_SOCKET is not set
 # CONFIG_NFT_OSF is not set
@@ -1065,6 +1067,7 @@ CONFIG_NFT_HASH=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+# CONFIG_NFT_FIB_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1233,7 +1236,7 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1273,7 +1276,7 @@ CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
diff --git a/main/linux-lts/config-virt.x86_64 b/main/linux-lts/config-virt.x86_64
index 5c42e70ac1..cd7c9848c5 100644
--- a/main/linux-lts/config-virt.x86_64
+++ b/main/linux-lts/config-virt.x86_64
@@ -1112,6 +1112,8 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+# CONFIG_NFT_FIB_INET is not set
 # CONFIG_NFT_XFRM is not set
 # CONFIG_NFT_SOCKET is not set
 # CONFIG_NFT_OSF is not set
@@ -1120,6 +1122,7 @@ CONFIG_NFT_HASH=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
+# CONFIG_NFT_FIB_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1288,7 +1291,7 @@ CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1329,7 +1332,7 @@ CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m