[OS-BUILD PATCHv2] [redhat] Update configs for mod-internal.list

[Don Zickus (via Email Bridge)]

From: Don Zickus

[redhat] Update configs for mod-internal.list

Several of the options for mod-internal.list are now out of sync
with RHEL8. Adjust accordingly.

Cc: Waiman Long 
Cc: Jiri Benc

Signed-off-by: Laura Abbott 
Signed-off-by: Don Zickus

V2: rebase to latest
V3: Adjust CONFIG_NET_ACT_ options (Jiri B.)

diff a/redhat/configs/ark/debug/arm/aarch64/CONFIG_TORTURE_TEST b/redhat/configs/ark/debug/arm/aarch64/CONFIG_TORTURE_TEST
--- a/redhat/configs/ark/debug/arm/aarch64/CONFIG_TORTURE_TEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TORTURE_TEST=m
diff a/redhat/configs/ark/generic/CONFIG_NET_ACT_CTINFO b/redhat/configs/ark/generic/CONFIG_NET_ACT_CTINFO
--- a/redhat/configs/ark/generic/CONFIG_NET_ACT_CTINFO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_ACT_CTINFO is not set
diff a/redhat/configs/ark/debug/arm/aarch64/CONFIG_LOCK_TORTURE_TEST b/redhat/configs/common/debug/CONFIG_LOCK_TORTURE_TEST
--- a/redhat/configs/ark/debug/arm/aarch64/CONFIG_LOCK_TORTURE_TEST
+++ b/redhat/configs/common/debug/CONFIG_LOCK_TORTURE_TEST
diff a/redhat/configs/fedora/generic/CONFIG_RCU_TORTURE_TEST b/redhat/configs/common/debug/CONFIG_RCU_TORTURE_TEST
--- a/redhat/configs/fedora/generic/CONFIG_RCU_TORTURE_TEST
+++ b/redhat/configs/common/debug/CONFIG_RCU_TORTURE_TEST
diff a/redhat/configs/common/generic/CONFIG_NET_ACT_CTINFO b/redhat/configs/common/generic/CONFIG_NET_ACT_CTINFO
--- a/redhat/configs/common/generic/CONFIG_NET_ACT_CTINFO
+++ b/redhat/configs/common/generic/CONFIG_NET_ACT_CTINFO
@@ -1 +1 @@
-CONFIG_NET_ACT_CTINFO=m
+# CONFIG_NET_ACT_CTINFO is not set
diff a/redhat/configs/common/generic/CONFIG_NET_ACT_MPLS b/redhat/configs/common/generic/CONFIG_NET_ACT_MPLS
--- a/redhat/configs/common/generic/CONFIG_NET_ACT_MPLS
+++ b/redhat/configs/common/generic/CONFIG_NET_ACT_MPLS
@@ -1 +1 @@
-CONFIG_NET_ACT_MPLS=m
+# CONFIG_NET_ACT_MPLS is not set
diff a/redhat/configs/ark/generic/CONFIG_RCU_TORTURE_TEST b/redhat/configs/common/generic/CONFIG_RCU_TORTURE_TEST
--- a/redhat/configs/ark/generic/CONFIG_RCU_TORTURE_TEST
+++ b/redhat/configs/common/generic/CONFIG_RCU_TORTURE_TEST
diff a/redhat/configs/fedora/debug/CONFIG_LOCK_TORTURE_TEST b/redhat/configs/fedora/debug/CONFIG_LOCK_TORTURE_TEST
--- a/redhat/configs/fedora/debug/CONFIG_LOCK_TORTURE_TEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOCK_TORTURE_TEST=m
diff a/redhat/mod-internal.list b/redhat/mod-internal.list
--- a/redhat/mod-internal.list
+++ b/redhat/mod-internal.list
@@ -1,7 +1,10 @@
 dmatest
+dmatest
+locktorture
 mac80211_hwsim
 netdevsim
 pktgen
+rcutorture
 rocker
 test_klp_atomic_replace
 test_klp_callbacks_demo
@@ -13,3 +16,4 @@ test_klp_shadow_vars
 test_klp_state
 test_klp_state2
 test_klp_state3
+torture

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/987

[Don Zickus (via Email Bridge)]

From: Don Zickus on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/987#note_54138160...

@jbencrh @llong1 - have time for a review?

[Waiman Long (via Email Bridge)]

From: Waiman Long on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/987#note_54139340...

Your patch seems to put CONFIG_LOCK_TORTURE_TEST in common/debug and put
CONFIG_RCU_TORTURE_TEST in both debug and generic. However you remove
CONFIG_TORTURE_TEST. That won't work. All 3 CONFIG's should be in the
same place. I will say putting them into generic is fine. Both
lock_torture_test.mod and rcu_torture_test.mod have dependency on
torture_test.mod which provides some test functions used by both.

BTW, I don't have developer/contributor privilege in kernel-ark so I can
ack or nack your patch.

-Longman