Two Kconfig symbols were part of upstream v5.3-rc1 but didn't make it
into v5.3 (for reasons I couldn't be bothered to unearth): PREEMPT_LL
and SOUNDWIRE_BUS. Remove them from our configuration generation system
too.
Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl>
---
configs/fedora/generic/CONFIG_PREEMPT_LL | 1 -
configs/fedora/generic/CONFIG_SOUNDWIRE_BUS | 1 -
kernel-aarch64-debug.config | 2 --
kernel-aarch64.config | 2 --
kernel-armv7hl-debug.config | 2 --
kernel-armv7hl-lpae-debug.config | 2 --
kernel-armv7hl-lpae.config | 2 --
kernel-armv7hl.config | 2 --
kernel-i686-debug.config | 2 --
kernel-i686.config | 2 --
kernel-ppc64le-debug.config | 2 --
kernel-ppc64le.config | 2 --
kernel-s390x-debug.config | 2 --
kernel-s390x.config | 2 --
kernel-x86_64-debug.config | 2 --
kernel-x86_64.config | 2 --
16 files changed, 30 deletions(-)
delete mode 100644 configs/fedora/generic/CONFIG_PREEMPT_LL
delete mode 100644 configs/fedora/generic/CONFIG_SOUNDWIRE_BUS
diff --git a/configs/fedora/generic/CONFIG_PREEMPT_LL
b/configs/fedora/generic/CONFIG_PREEMPT_LL
deleted file mode 100644
index 513294a39698..000000000000
--- a/configs/fedora/generic/CONFIG_PREEMPT_LL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT_LL is not set
diff --git a/configs/fedora/generic/CONFIG_SOUNDWIRE_BUS
b/configs/fedora/generic/CONFIG_SOUNDWIRE_BUS
deleted file mode 100644
index dd3714b7cfa6..000000000000
--- a/configs/fedora/generic/CONFIG_SOUNDWIRE_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOUNDWIRE_BUS=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 4b1ce9112b4b..829b26e47a9c 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4686,7 +4686,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -6105,7 +6104,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPARSE_IRQ=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 21df2fad32d8..68def1acb7b4 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4666,7 +4666,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -6083,7 +6082,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPARSE_IRQ=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index f94f3971be1b..bdcb946b66e6 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4788,7 +4788,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -6316,7 +6315,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPARSEMEM_MANUAL=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 3941abcffc40..4a2db5223a3d 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4605,7 +4605,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -6008,7 +6007,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPARSEMEM_MANUAL=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 02461d14b794..e528fbd8a759 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4586,7 +4586,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5987,7 +5986,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPARSEMEM_MANUAL=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6cc7b413783d..25f087883fe0 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4769,7 +4769,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -6295,7 +6294,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPARSEMEM_MANUAL=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 272fe3f12912..62ad233919ca 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4291,7 +4291,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5562,7 +5561,6 @@ CONFIG_SONYPI_COMPAT=y
CONFIG_SONYPI=m
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE_INTEL=m
CONFIG_SOUNDWIRE=y
diff --git a/kernel-i686.config b/kernel-i686.config
index f9c8e2035edc..bb119fba8b1e 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4272,7 +4272,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5541,7 +5540,6 @@ CONFIG_SONYPI_COMPAT=y
CONFIG_SONYPI=m
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE_INTEL=m
CONFIG_SOUNDWIRE=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 82585d81a157..f64e259eaf77 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3999,7 +3999,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5187,7 +5186,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPAPR_TCE_IOMMU=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 0c7b7bcafc4d..3fe2c1c5c88c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3978,7 +3978,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5164,7 +5163,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPAPR_TCE_IOMMU=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index c325d31ba282..f6b31a4f7b02 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3933,7 +3933,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5130,7 +5129,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
# CONFIG_SOUND is not set
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPARSEMEM_MANUAL=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 3ff05de88726..9e7849ed0599 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3912,7 +3912,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5107,7 +5106,6 @@ CONFIG_SONY_FF=y
# CONFIG_SONYPI is not set
# CONFIG_SOUND is not set
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE=y
CONFIG_SPARSEMEM_MANUAL=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index a40147d602da..a61aafee8e52 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4335,7 +4335,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5618,7 +5617,6 @@ CONFIG_SONYPI_COMPAT=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE_INTEL=m
CONFIG_SOUNDWIRE=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 99e018991026..3e83cb1df55c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4316,7 +4316,6 @@ CONFIG_PPTP=m
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5597,7 +5596,6 @@ CONFIG_SONYPI_COMPAT=y
# CONFIG_SONYPI is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE_INTEL=m
CONFIG_SOUNDWIRE=y
--
2.21.0