From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Fix up PREEMPT configs
While preempt_dynamic was greatly improved at the beginning of the merge
window, the config to make things work was messy and the new BEHAVIOUR
configs were confusing to some. With commit
a8b76910e465d718effce0cad306a21fa4f3526b the BEHAVIOUR config options
are gone and we now default to whichever CONFIG_PREEMPT is selected.
This MR moves us to the new config options, but should leave the kernel
behaving as before with PREEMPT_VOLUNTARY as the default with
PREEMPT_DYNAMIC enabled for all arches but s390 which does not enable
DYNAMIC and builds with PREEMPT_NONE.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/configs/common/generic/CONFIG_PREEMPT
b/redhat/configs/common/generic/CONFIG_PREEMPT
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_PREEMPT
+++ b/redhat/configs/common/generic/CONFIG_PREEMPT
@@ -1 +1 @@
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
diff --git a/redhat/configs/common/generic/CONFIG_PREEMPT_BEHAVIOUR
b/redhat/configs/common/generic/CONFIG_PREEMPT_BEHAVIOUR
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_PREEMPT_BEHAVIOUR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT_BEHAVIOUR is not set
diff --git a/redhat/configs/common/generic/CONFIG_PREEMPT_NONE
b/redhat/configs/common/generic/CONFIG_PREEMPT_NONE
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_PREEMPT_NONE
+++ b/redhat/configs/common/generic/CONFIG_PREEMPT_NONE
@@ -1 +1 @@
-CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set
diff --git a/redhat/configs/common/generic/CONFIG_PREEMPT_NONE_BEHAVIOUR
b/redhat/configs/common/generic/CONFIG_PREEMPT_NONE_BEHAVIOUR
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_PREEMPT_NONE_BEHAVIOUR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT_NONE_BEHAVIOUR is not set
diff --git a/redhat/configs/common/generic/CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR
b/redhat/configs/common/generic/CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y
diff --git a/redhat/configs/common/generic/s390x/CONFIG_PREEMPT_NONE_BEHAVIOUR
b/redhat/configs/common/generic/s390x/CONFIG_PREEMPT_NONE_BEHAVIOUR
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/s390x/CONFIG_PREEMPT_NONE_BEHAVIOUR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PREEMPT_NONE_BEHAVIOUR=y
diff --git a/redhat/configs/common/generic/s390x/CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR
b/redhat/configs/common/generic/s390x/CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/s390x/CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_PREEMPT
b/redhat/configs/pending-common/generic/CONFIG_PREEMPT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-common/generic/CONFIG_PREEMPT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_PREEMPT_NONE
b/redhat/configs/pending-common/generic/CONFIG_PREEMPT_NONE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-common/generic/CONFIG_PREEMPT_NONE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT_NONE is not set
diff --git a/redhat/configs/pending-common/generic/s390x/CONFIG_PREEMPT_NONE
b/redhat/configs/pending-common/generic/s390x/CONFIG_PREEMPT_NONE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-common/generic/s390x/CONFIG_PREEMPT_NONE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PREEMPT_NONE=y
diff --git a/redhat/configs/pending-common/generic/s390x/CONFIG_PREEMPT_VOLUNTARY
b/redhat/configs/pending-common/generic/s390x/CONFIG_PREEMPT_VOLUNTARY
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-common/generic/s390x/CONFIG_PREEMPT_VOLUNTARY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT_VOLUNTARY is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1500