From 2a9209f999f5013d2f288ee295ac529ff7ed4119 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 24 Nov 2021 11:48:11 -0600 Subject: kernel-5.16-0.rc2.20211124git5d9f4cf36721.19 * Wed Nov 24 2021 Fedora Kernel Team [5.16-0.rc2.20211124git5d9f4cf36721.19] - Fix up PREEMPT configs (Justin M. Forbes) - New configs in drivers/media (Fedora Kernel Team) - New configs in drivers/net/ethernet/litex (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 3 --- kernel-aarch64-debug-rhel.config | 5 +---- kernel-aarch64-fedora.config | 3 --- kernel-aarch64-rhel.config | 5 +---- kernel-armv7hl-debug-fedora.config | 3 --- kernel-armv7hl-fedora.config | 3 --- kernel-armv7hl-lpae-debug-fedora.config | 3 --- kernel-armv7hl-lpae-fedora.config | 3 --- kernel-i686-debug-fedora.config | 3 --- kernel-i686-fedora.config | 3 --- kernel-ppc64le-debug-fedora.config | 3 --- kernel-ppc64le-debug-rhel.config | 5 +---- kernel-ppc64le-fedora.config | 3 --- kernel-ppc64le-rhel.config | 5 +---- kernel-s390x-debug-fedora.config | 3 --- kernel-s390x-debug-rhel.config | 5 +---- kernel-s390x-fedora.config | 3 --- kernel-s390x-rhel.config | 5 +---- kernel-s390x-zfcpdump-rhel.config | 5 +---- kernel-x86_64-debug-fedora.config | 3 --- kernel-x86_64-debug-rhel.config | 5 +---- kernel-x86_64-fedora.config | 3 --- kernel-x86_64-rhel.config | 5 +---- kernel.spec | 21 +++++++++++++-------- sources | 6 +++--- 26 files changed, 26 insertions(+), 90 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 7399f9684..7f02eb68b 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 = 18 +RHEL_RELEASE = 19 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 779452df8..012c983ff 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5489,15 +5489,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index c5424ddeb..df101b66f 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3794,7 +3794,7 @@ CONFIG_NET_VENDOR_HISILICON=y CONFIG_NET_VENDOR_HUAWEI=y # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_NET_VENDOR_MICREL is not set @@ -4417,17 +4417,14 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set CONFIG_PREEMPT_DYNAMIC=y # 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 990707698..cb6b7601f 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5465,15 +5465,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 05a993473..db9e9be60 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3773,7 +3773,7 @@ CONFIG_NET_VENDOR_HISILICON=y CONFIG_NET_VENDOR_HUAWEI=y # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_NET_VENDOR_MICREL is not set @@ -4395,17 +4395,14 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set CONFIG_PREEMPT_DYNAMIC=y # 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index e2f56d0d1..b4f64cf0b 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5592,15 +5592,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 979f8d790..d09e0f1bf 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5569,15 +5569,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y 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 d07d047be..2dcb6be46 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5458,15 +5458,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y 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 884547e8b..a139c0f98 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5435,15 +5435,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y 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 a367d44cb..f49bd2aa8 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -4977,15 +4977,12 @@ CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 47d0b174a..983a2faef 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -4954,15 +4954,12 @@ CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y 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 16594cd3a..d8cbd2476 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4684,15 +4684,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index b873fc9d3..17067cb6e 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3609,7 +3609,7 @@ CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_IBM=y CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set @@ -4217,17 +4217,14 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set CONFIG_PREEMPT_DYNAMIC=y # 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 7d7fe83c9..f3badb359 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4660,15 +4660,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index cff018efc..ae3afead4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3591,7 +3591,7 @@ CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_IBM=y CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set @@ -4199,17 +4199,14 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set CONFIG_PREEMPT_DYNAMIC=y # 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 3e00f2a7b..72a7436b6 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4620,15 +4620,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -# CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 2e5d569c2..a45dfb0b0 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3589,7 +3589,7 @@ CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set # CONFIG_NET_VENDOR_INTEL is not set -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set @@ -4153,17 +4153,14 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set # CONFIG_PREEMPT_DYNAMIC is not set # 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_BEHAVIOUR=y CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -# CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index c049bbc37..2a265a9f9 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4596,15 +4596,12 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -# CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 2b044bfc0..91fe2cba3 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3571,7 +3571,7 @@ CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set # CONFIG_NET_VENDOR_INTEL is not set -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set @@ -4135,17 +4135,14 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set # CONFIG_PREEMPT_DYNAMIC is not set # 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_BEHAVIOUR=y CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -# CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 11cbc1a99..e9eb3ce48 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3592,7 +3592,7 @@ CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set # CONFIG_NET_VENDOR_INTEL is not set -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set @@ -4157,17 +4157,14 @@ CONFIG_PPS_CLIENT_LDISC=y # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set # CONFIG_PREEMPT_DYNAMIC is not set # 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_BEHAVIOUR=y CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -# CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 84f6f1a91..7355677d6 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5020,15 +5020,12 @@ CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ac72c1125..656dcf9c3 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3794,7 +3794,7 @@ CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_HUAWEI=y # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set @@ -4392,17 +4392,14 @@ CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set CONFIG_PREEMPT_DYNAMIC=y # 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e927c5d6c..6b770bb4f 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4997,15 +4997,12 @@ CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 9fbacdccb..6bc636d38 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3774,7 +3774,7 @@ CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_HUAWEI=y # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y -CONFIG_NET_VENDOR_LITEX=y +# CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set @@ -4371,17 +4371,14 @@ CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m -# CONFIG_PREEMPT_BEHAVIOUR is not set CONFIG_PREEMPT_DYNAMIC=y # 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_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set diff --git a/kernel.spec b/kernel.spec index 4701822fd..6d342b311 100755 --- a/kernel.spec +++ b/kernel.spec @@ -83,9 +83,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc2.18 +%global distro_build 0.rc2.20211124git5d9f4cf36721.19 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc2.18 +%define pkgrelease 0.rc2.20211124git5d9f4cf36721.19 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.18%{?buildid}%{?dist} +%define specrelease 0.rc2.20211124git5d9f4cf36721.19%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -682,7 +682,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc2.tar.xz +Source0: linux-5.16-rc2-54-g5d9f4cf36721.tar.xz Source1: Makefile.rhelver @@ -1374,8 +1374,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc2 -c -mv linux-5.16-rc2 linux-%{KVERREL} +%setup -q -n kernel-5.16-rc2-54-g5d9f4cf36721 -c +mv linux-5.16-rc2-54-g5d9f4cf36721 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2184,7 +2184,7 @@ InitBuildVars %global perf_build_extra_opts CORESIGHT=1 %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2972,6 +2972,11 @@ fi # # %changelog +* Wed Nov 24 2021 Fedora Kernel Team [5.16-0.rc2.20211124git5d9f4cf36721.19] +- Fix up PREEMPT configs (Justin M. Forbes) +- New configs in drivers/media (Fedora Kernel Team) +- New configs in drivers/net/ethernet/litex (Fedora Kernel Team) + * Sat Nov 20 2021 Fedora Kernel Team [5.16-0.rc1.20211120gita90af8f15bdc.17] - spec: add bpf_testmod.ko to kselftests/bpf (Viktor Malik) diff --git a/sources b/sources index 37acf4b54..175286f80 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.16-rc2.tar.xz) = 9d4b59ad6e6e64429dea5c44e7dee3cbe987f39ea2e98a345d5a08a324e464a0cd8af1cf80e455fbfad23517a0a31822aa2a837521be97fe9177a5a6c6872e7d -SHA512 (kernel-abi-stablelists-5.16.0-0.rc2.18.tar.bz2) = c39eceb4b1dd8711c57782ede8b781353ef0f6f19aa109130f6db908fdde97f34f2b3e1bd2696b40fd34ff3e4d83badc33db5b5b4c61cd510faa6b893e452e12 -SHA512 (kernel-kabi-dw-5.16.0-0.rc2.18.tar.bz2) = 5495b5ea8887089ae9629867a7c18cb02082ef9f32bfe3b58f6b7ec8b6a479c6bb39521f60346e60f4fde6f92318682fbca09fd38f32283458dd9835596f87ef +SHA512 (linux-5.16-rc2-54-g5d9f4cf36721.tar.xz) = ad432131817fe1c3c0b375c6bdf60fe396bd03cc1427447c3036c83f6c498a96b638dd3574c14761841fbd02dd67ee5d33e95608f045a575747a6e3ddc75a9a6 +SHA512 (kernel-abi-stablelists-5.16.0-0.rc2.20211124git5d9f4cf36721.19.tar.bz2) = 28da61596dc6925a6e647ec86d55538d9f898c02dda59cd199932455980fcbcf941f59ab5e3030c7e65a69bdbaa9821dcbbd11d540e7931d9969b2b8f0c1e730 +SHA512 (kernel-kabi-dw-5.16.0-0.rc2.20211124git5d9f4cf36721.19.tar.bz2) = 25c8723997e86cc43410d31415ebe3813dfc566f773b32ce920b62ce2342ff675864f11845046616ef1caeee8f8143efd4e9380ed5a5cf17df5b10e32f541328 -- cgit