19 files changed, 88 insertions, 84 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index c0d725339..db1122d3b 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 193
+RHEL_RELEASE = 198
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 25a21eb36..5709b541e 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -939,6 +939,7 @@ CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
+# CONFIG_CEC_GPIO is not set
 CONFIG_CEC_MESON_AO=m
 CONFIG_CEC_MESON_G12A_AO=m
 # CONFIG_CEC_PIN_ERROR_INJ is not set
@@ -1511,6 +1512,7 @@ CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
@@ -2319,6 +2321,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DWAPB=m
@@ -5247,10 +5250,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 38e903f53..a46c67125 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -939,6 +939,7 @@ CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
+# CONFIG_CEC_GPIO is not set
 CONFIG_CEC_MESON_AO=m
 CONFIG_CEC_MESON_G12A_AO=m
 # CONFIG_CEC_PIN_ERROR_INJ is not set
@@ -1504,6 +1505,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -2303,6 +2305,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DWAPB=m
@@ -5224,10 +5227,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index b0cd8fe7e..88f16fcd7 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -957,6 +957,7 @@ CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
+# CONFIG_CEC_GPIO is not set
 CONFIG_CEC_MESON_AO=m
 CONFIG_CEC_MESON_G12A_AO=m
 # CONFIG_CEC_PIN_ERROR_INJ is not set
@@ -1508,6 +1509,7 @@ CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
@@ -2342,6 +2344,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DA9052=m
@@ -5355,10 +5358,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 7041fecae..c05cf16c6 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -957,6 +957,7 @@ CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
+# CONFIG_CEC_GPIO is not set
 CONFIG_CEC_MESON_AO=m
 CONFIG_CEC_MESON_G12A_AO=m
 # CONFIG_CEC_PIN_ERROR_INJ is not set
@@ -1501,6 +1502,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -2327,6 +2329,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DA9052=m
@@ -5333,10 +5336,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 199a54d5b..1a61d8df4 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -934,6 +934,7 @@ CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
+# CONFIG_CEC_GPIO is not set
 CONFIG_CEC_MESON_AO=m
 CONFIG_CEC_MESON_G12A_AO=m
 # CONFIG_CEC_PIN_ERROR_INJ is not set
@@ -1476,6 +1477,7 @@ CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
@@ -2293,6 +2295,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DAVINCI=y
@@ -5221,10 +5224,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 89d2abb37..7d6e7890b 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -934,6 +934,7 @@ CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
+# CONFIG_CEC_GPIO is not set
 CONFIG_CEC_MESON_AO=m
 CONFIG_CEC_MESON_G12A_AO=m
 # CONFIG_CEC_PIN_ERROR_INJ is not set
@@ -1469,6 +1470,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -2278,6 +2280,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DAVINCI=y
@@ -5199,10 +5202,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 85ed09247..58ee79192 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -763,6 +763,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
+# CONFIG_CEC_GPIO is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
@@ -1213,6 +1214,7 @@ CONFIG_DEBUG_OBJECTS=y
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
@@ -1992,6 +1994,7 @@ CONFIG_GPIO_AMD_FCH=m
 CONFIG_GPIO_AMDPT=m
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_CRYSTAL_COVE=y
@@ -4764,10 +4767,12 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 3408ed0f4..1d3c0445c 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -762,6 +762,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
+# CONFIG_CEC_GPIO is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
@@ -1205,6 +1206,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -1975,6 +1977,7 @@ CONFIG_GPIO_AMD_FCH=m
 CONFIG_GPIO_AMDPT=m
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_CRYSTAL_COVE=y
@@ -4742,10 +4745,12 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index d1d147f2a..a442a335d 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -720,6 +720,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
+# CONFIG_CEC_GPIO is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
@@ -1151,6 +1152,7 @@ CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
@@ -1855,6 +1857,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_DWAPB is not set
@@ -4459,10 +4462,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index a96be4994..ba189a2a8 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -719,6 +719,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
+# CONFIG_CEC_GPIO is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
@@ -1143,6 +1144,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -1838,6 +1840,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_DWAPB is not set
@@ -4436,10 +4439,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 6b186d5c3..99ff1858f 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -726,6 +726,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
+# CONFIG_CEC_GPIO is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
@@ -1161,6 +1162,7 @@ CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
@@ -1854,6 +1856,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_DWAPB is not set
@@ -4389,10 +4392,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 79cf59605..1b31b4a9e 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -725,6 +725,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
+# CONFIG_CEC_GPIO is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
@@ -1153,6 +1154,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -1837,6 +1839,7 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_DWAPB is not set
@@ -4366,10 +4369,12 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 009e8e27f..148cf88ec 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -773,6 +773,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
+# CONFIG_CEC_GPIO is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
@@ -1252,6 +1253,7 @@ CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+CONFIG_DEBUG_PREEMPT=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
@@ -2031,6 +2033,7 @@ CONFIG_GPIO_AMD_FCH=m
 CONFIG_GPIO_AMDPT=m
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_CRYSTAL_COVE=y
@@ -4804,10 +4807,12 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index bdec137ef..0640e1e58 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -772,6 +772,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CEC_CH7322=m
+# CONFIG_CEC_GPIO is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
@@ -1244,6 +1245,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -2014,6 +2016,7 @@ CONFIG_GPIO_AMD_FCH=m
 CONFIG_GPIO_AMDPT=m
 # CONFIG_GPIO_BCM_XGS_IPROC is not set
 CONFIG_GPIO_BD9571MWV=m
+# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_CRYSTAL_COVE=y
@@ -4782,10 +4785,12 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_TRACER is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRESTERA=m
 CONFIG_PRESTERA_PCI=m
diff --git a/kernel.spec b/kernel.spec
index 303a6bec5..cd6ef2e7a 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,7 +66,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc8.20210423git7af08140979a.193
+%global distro_build 198
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -107,13 +107,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.12.0
-%define pkgrelease 0.rc8.20210423git7af08140979a.193
+%define pkgrelease 198
 
 # This is needed to do merge window version magic
 %define patchlevel 12
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc8.20210423git7af08140979a.193%{?buildid}%{?dist}
+%define specrelease 198%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -203,7 +203,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # The kernel tarball/base version
 %define kversion 5.12
@@ -622,7 +622,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210423git7af08140979a.tar.xz
+Source0: linux-5.12.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1276,8 +1276,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20210423git7af08140979a -c
-mv linux-20210423git7af08140979a linux-%{KVERREL}
+%setup -q -n kernel-5.12 -c
+mv linux-5.12 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2791,6 +2791,12 @@ fi
 #
 #
 %changelog
+* Mon Apr 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-198]
+- mod-extra.list.fedora: remove 72 unused modules (Paul Bolle)
+
+* Mon Apr 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-197]
+- Create ark-latest branch last for CI scripts (Don Zickus)
+
 * Wed Apr 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc8.20210421git7af08140979a.193]
 - Replace /usr/libexec/platform-python with /usr/bin/python3 (David Ward)
 
diff --git a/mod-extra.list.fedora b/mod-extra.list.fedora
index c83fc33a9..2cf559b38 100644
--- a/mod-extra.list.fedora
+++ b/mod-extra.list.fedora
@@ -1,21 +1,12 @@
 6pack.ko
 a3d.ko
-act200l-sir.ko
-actisys-sir.ko
 adi.ko
 aer_inject.ko
-af_802154.ko
 affs.ko
-ali-ircc.ko
 analog.ko
 appletalk.ko
 atm.ko
-avma1_cs.ko
-avm_cs.ko
-avmfritz.ko
 ax25.ko
-b1.ko
-bas_gigaset.ko
 batman-adv.ko
 baycom_par.ko
 baycom_ser_fdx.ko
@@ -23,82 +14,37 @@ baycom_ser_hdx.ko
 befs.ko
 bpqether.ko
 br2684.ko
-capi.ko
-c_can.ko
-c_can_platform.ko
 clip.ko
 cobra.ko
 coda.ko
 cuse.ko
 db9.ko
-dccp_diag.ko
-dccp_ipv4.ko
-dccp_ipv6.ko
-dccp.ko
-dccp_probe.ko
-diva_idi.ko
-divas.ko
 dlm.ko
-ds1wm.ko
 ds2482.ko
 ds2490.ko
-dss1_divert.ko
-elsa_cs.ko
-ems_pci.ko
 ems_usb.ko
 esd_usb2.ko
-esi-sir.ko
 floppy.ko
 gamecon.ko
 gf2k.ko
 gfs2.ko
-gigaset.ko
-girbil-sir.ko
 grip.ko
 grip_mp.ko
 guillemot.ko
 hdlcdrv.ko
-hfc4s8s_l1.ko
-hfcmulti.ko
-hfcpci.ko
-hisax.ko
-hwa-rc.ko
-hysdn.ko
-i2400m.ko
-i2400m-sdio.ko
-i2400m-usb.ko
-ieee802154.ko
-iforce.ko
 interact.ko
 ipddp.ko
-ipx.ko
-isdn.ko
 joydump.ko
-kingsun-sir.ko
-ks959-sir.ko
-ksdazzle-sir.ko
-kvaser_pci.ko
-l2tp_core.ko
 l2tp_debugfs.ko
 l2tp_eth.ko
-l2tp_ip.ko
 l2tp_netlink.ko
 l2tp_ppp.ko
 lec.ko
-ma600-sir.ko
 magellan.ko
-mcp2120-sir.ko
-mISDN_core.ko
-mISDN_dsp.ko
 mkiss.ko
-mptbase.ko
 mptctl.ko
 mptfc.ko
-nci.ko
-ncpfs.ko
-netjet.ko
 netrom.ko
-nfc.ko
 nilfs2.ko
 ocfs2_dlmfs.ko
 ocfs2_dlm.ko
@@ -107,7 +53,6 @@ ocfs2_nodemanager.ko
 ocfs2_stackglue.ko
 ocfs2_stack_o2cb.ko
 ocfs2_stack_user.ko
-old_belkin-sir.ko
 orinoco_cs.ko
 orinoco.ko
 orinoco_nortel.ko
@@ -115,8 +60,6 @@ orinoco_pci.ko
 orinoco_plx.ko
 orinoco_usb.ko
 pcspkr.ko
-plx_pci.ko
-pn_pep.ko
 pppoatm.ko
 rds.ko
 rds_rdma.ko
@@ -136,14 +79,9 @@ sch_qfq.ko
 sch_red.ko
 sch_sfb.ko
 sch_teql.ko
-sctp.ko
-sctp_probe.ko
 sidewinder.ko
-sja1000.ko
-sja1000_platform.ko
 slcan.ko
 slip.ko
-softing_cs.ko
 softing.ko
 spaceball.ko
 spaceorb.ko
@@ -160,36 +98,26 @@ tcp_vegas.ko
 tcp_veno.ko
 tcp_westwood.ko
 tcp_yeah.ko
-tekram-sir.ko
 tmdc.ko
-toim3232-sir.ko
 trancevibrator.ko
 turbografx.ko
 twidjoy.ko
 ubifs.ko
 ufs.ko
-umc.ko
 usbip-core.ko
 usbip-host.ko
-uwb.ko
 vcan.ko
 vhci-hcd.ko
-w1_bq27000.ko
 w1_ds2408.ko
 w1_ds2423.ko
 w1_ds2431.ko
 w1_ds2433.ko
-w1_ds2760.ko
 w1_ds2780.ko
 w1_ds2781.ko
 w1_ds28e04.ko
 w1_smem.ko
 w1_therm.ko
-w6692.ko
 walkera0701.ko
-wanrouter.ko
 warrior.ko
-whci.ko
-wire.ko
 yam.ko
 zhenhua.ko
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index aff8c61da..4de187699 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -140,7 +140,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index bc19584fee59..3251d831d4da 100644
+index 3a10a8e08b6d..015ce9aa9a48 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index f168e4d4a..f242a25b0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210423git7af08140979a.tar.xz) = 74c7e23a135668b980477ee36edcbcb71d12748d91abb451622931bb6766a361797aef352a474841224cedb9835b9b4d8f689c8c27d033a8ecab60f7fe6d1e40
-SHA512 (kernel-abi-whitelists-5.12.0-0.rc8.20210423git7af08140979a.193.tar.bz2) = 6e9647c1919a917c9fd6a7ba6657fedc3b38ef1cb5b095ba106dabd75820666b22b575fcbd3bfb0a6ba97120d6c280daf0f615fee79a6480389cdb53b8576d40
-SHA512 (kernel-kabi-dw-5.12.0-0.rc8.20210423git7af08140979a.193.tar.bz2) = d233dc08bac4c5a40fdc19816d2914a5b67f5593d468af6187b0809c4939264c25d75e8111b6cd2421c85de9ff5904dbc201290a72ce5669d172396be492c0d8
+SHA512 (linux-5.12.tar.xz) = dda0486ae07e36648c0b1f436426d14e9b45b73db0efb17430b74e48d5e670f1b474368eae6bbf23a0adfcf7edce161b4371f7a1c8c40624a2fe7995424ef29a
+SHA512 (kernel-abi-whitelists-5.12.0-198.tar.bz2) = 1800afa52fd84ab9952321585adf250e59811c609fe866fbf1be769558b180221e8b8bb2a94cd07b81d79fe06e27eae7135384e2487fd78a946c66d4b21da932
+SHA512 (kernel-kabi-dw-5.12.0-198.tar.bz2) = 3ef1ffa96b25c66bd8c9d29d8388d5212ad98593ee497dc84161e1e7a4cfbfebe741055380a4ecf9cf567bf2850839bd85491d36e4deda0068cfdf6aee868c78