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

[Don Zickus (via Email Bridge)]

From: Don Zickus <dzickus(a)redhat.com&gt;

[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 <longman(a)redhat.com&gt;
Cc: Jiri Benc <jbenc(a)redhat.com&gt;

Signed-off-by: Laura Abbott <labbott(a)redhat.com&gt;
Signed-off-by: Don Zickus <dzickus(a)redhat.com&gt;

V2: rebase to latest
V3: Adjust CONFIG_NET_ACT_ options (Jiri B.)
V4: Update TORTURE_TEST configs (Waiman L.)

diff a/redhat/configs/ark/debug/arm/aarch64/CONFIG_LOCK_TORTURE_TEST
b/redhat/configs/ark/debug/arm/aarch64/CONFIG_LOCK_TORTURE_TEST
--- a/redhat/configs/ark/debug/arm/aarch64/CONFIG_LOCK_TORTURE_TEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOCK_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/generic/CONFIG_RCU_TORTURE_TEST
b/redhat/configs/ark/generic/CONFIG_RCU_TORTURE_TEST
--- a/redhat/configs/ark/generic/CONFIG_RCU_TORTURE_TEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RCU_TORTURE_TEST is not set
diff a/redhat/configs/common/generic/CONFIG_LOCK_TORTURE_TEST
b/redhat/configs/common/generic/CONFIG_LOCK_TORTURE_TEST
--- a/redhat/configs/common/generic/CONFIG_LOCK_TORTURE_TEST
+++ b/redhat/configs/common/generic/CONFIG_LOCK_TORTURE_TEST
@@ -1 +1 @@
-# CONFIG_LOCK_TORTURE_TEST is not set
+CONFIG_LOCK_TORTURE_TEST=m
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/fedora/generic/CONFIG_RCU_TORTURE_TEST
b/redhat/configs/common/generic/CONFIG_RCU_TORTURE_TEST
--- a/redhat/configs/fedora/generic/CONFIG_RCU_TORTURE_TEST
+++ b/redhat/configs/common/generic/CONFIG_RCU_TORTURE_TEST
diff a/redhat/configs/ark/debug/arm/aarch64/CONFIG_TORTURE_TEST
b/redhat/configs/common/generic/CONFIG_TORTURE_TEST
--- a/redhat/configs/ark/debug/arm/aarch64/CONFIG_TORTURE_TEST
+++ b/redhat/configs/common/generic/CONFIG_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_54142...

@llong1 - updated with your thoughts. I *think* I got it right.  I also
added you to the project so you can ack.

[Waiman Long (via Email Bridge)]

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

Thanks for adding me to kernel-ark.

The changes look good to me now.

[Augusto Caringi (via Email Bridge)]

From: Augusto Caringi on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/987#note_54150...

request-ack-nack-evaluation

[Jiri Benc (via Email Bridge)]

From: Jiri Benc on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/987#note_54163...

Don, you're disabling CONFIG_NET_ACT_CTINFO and CONFIG_NET_ACT_MPLS
options everywhere but they should stay enabled in Fedora. Keep them as
'm' in common/generic and disable them in ark/generic, please
(CONFIG_NET_ACT_CTINFO seems to be already correct).

[Don Zickus (via Email Bridge)]

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

@jbencrh - ah ok.  I misunderstood the changes there. I will update.
Thanks!