main/linux-lts: enable NFT_FIB_IPV4, NFT_FIB_IPV6

enable  NFT_FIB_IPV4 and NFT_FIB_IPV6 modules
for now it these are not enabled on s390x and ppc64le because don't
have access to these machines
fixes: #11058

7 files changed, 36 insertions, 18 deletions

diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index 3ba2744698..c9600806c5 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -220,13 +220,13 @@ _dev() {
 }
 
 sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-aa4355d9fd32d212fbc9614a96759d574bd7474d87561f2f9ef6b8efeaacdfd3c902f6f96f2cbf6fb354c946c95c803ef4a5b869529711ede55226d54cf84d4b  config-lts.aarch64
+e44718f77a5817daf155d5ba1cab5a2ab1afce485e42164637254d320fadc28a8122f206e57d33e8180740421c88d358bba3d52e4d59deacc16db07626514515  config-lts.aarch64
 e4840371da27c28a67febbf6a91921098b0b55dfbf276bc744dc0fec93a7ba627f33e070f4a80156a07018002ff59ad00e67dfe2066511bccd33f1b34f718d42  config-lts.armv7
-b49b6efc7885d3f916bd0be29009b640b35005a5b4f052f08b106e7e172727672bbfa54b46daa9c28e810d06beb68b29e3eedff2bc2e320a286a37badaa02fa1  config-lts.x86
-fefa32ec2ed0e301a2718e5eec3259915fced25607fd029b24dece7af57b42befc7defd5c39e60e8f4ba48ac503e09cc954046078685ebe76557c5296a10ef93  config-lts.x86_64
+51d6512906def6c75147658c22513469089cfb1d65a095cff0d3630810920dbdf33d022ede131ba91536de4b71550acebe9666e4e94a0a9909f1c9a7223551e4  config-lts.x86
+ace6e5f807ab94a54b3eaeff45d6745a89d42480efb3d169a1183f2b20398e91964d0400327264f1fdfa0a58a5210b197115126100c526b512e138a46cba8ddf  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
+8f13fd5e2a30b98a4718f75221d6fe13c434cbcde432ad1aab0a8bf85937ee0038f5735ba741a670b94ec680fbce4728eeaf8935af4dd6b14722338446903288  config-virt.aarch64
+d948391ff437a030ce30f795983748f9eb876b0405d3ef6728590a69adc2a77c9182d39477854be268458d583b8bc34c48fec8bd38502f57f3d02b49c3c9bb36  config-virt.x86
+0926abbfeffb4bd532cdfd941cd771460fa0bb9f7a7612bac171a6448fccaa094c5ee9fcfe075076f3bd53b0c437d766e699bb96258cf2f80c40fe0c8d66dd94  config-virt.x86_64
 6f6d73c7ce71d47e810847149f4c258f5fb99c98fc67d385a3ff74889543a415bf8bb77c748a13f72b733bca770773731d84713a9be98d630b7377a792f11f5a  patch-5.4.6.xz"
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/config-lts.aarch64
index 0730dd29cb..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
diff --git a/main/linux-lts/config-lts.x86 b/main/linux-lts/config-lts.x86
index dc55bd5dec..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
diff --git a/main/linux-lts/config-lts.x86_64 b/main/linux-lts/config-lts.x86_64
index 0851fb86d6..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
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