summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-11-18 10:23:46 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-11-18 10:23:46 -0600
commitfd9011d43a02cf5bf091d387510cb00f912965ee (patch)
treeb1d5f3950cf73ce5e74bf088ccd689894877000b
parent77b569a1436c1867d38e049cad36043533f727cd (diff)
downloadkernel-fd9011d43a02cf5bf091d387510cb00f912965ee.tar.gz
kernel-fd9011d43a02cf5bf091d387510cb00f912965ee.tar.xz
kernel-fd9011d43a02cf5bf091d387510cb00f912965ee.zip
kernel-5.16-0.rc1.20211118git42eb8fdac2fc.16
* Thu Nov 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc1.20211118git42eb8fdac2fc.16] - kasan: test: Silence intentional read overflow warnings (Kees Cook) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog3
-rw-r--r--kernel-aarch64-debug-fedora.config3
-rw-r--r--kernel-aarch64-debug-rhel.config3
-rw-r--r--kernel-aarch64-fedora.config3
-rw-r--r--kernel-aarch64-rhel.config3
-rw-r--r--kernel-armv7hl-debug-fedora.config3
-rw-r--r--kernel-armv7hl-fedora.config3
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config3
-rw-r--r--kernel-armv7hl-lpae-fedora.config3
-rw-r--r--kernel-i686-debug-fedora.config3
-rw-r--r--kernel-i686-fedora.config3
-rw-r--r--kernel-ppc64le-debug-fedora.config3
-rw-r--r--kernel-ppc64le-debug-rhel.config3
-rw-r--r--kernel-ppc64le-fedora.config3
-rw-r--r--kernel-ppc64le-rhel.config3
-rw-r--r--kernel-s390x-debug-fedora.config3
-rw-r--r--kernel-s390x-debug-rhel.config3
-rw-r--r--kernel-s390x-fedora.config3
-rw-r--r--kernel-s390x-rhel.config3
-rw-r--r--kernel-s390x-zfcpdump-rhel.config3
-rw-r--r--kernel-x86_64-debug-fedora.config3
-rw-r--r--kernel-x86_64-debug-rhel.config3
-rw-r--r--kernel-x86_64-fedora.config3
-rw-r--r--kernel-x86_64-rhel.config3
-rwxr-xr-xkernel.spec26
-rw-r--r--patch-5.16-redhat.patch92
-rw-r--r--sources6
28 files changed, 115 insertions, 83 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 107c1b5e1..1948bc78a 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 = 14
+RHEL_RELEASE = 16
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index eac2a601b..abe01be63 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/8677ec5e639ddd6c17e47c34f3d661293a3d4f63
+ 8677ec5e639ddd6c17e47c34f3d661293a3d4f63 kasan: test: Silence intentional read overflow warnings
+
https://gitlab.com/cki-project/kernel-ark/-/commit/07b3d9b051aa347237b4c637a1984c1915c750b2
07b3d9b051aa347237b4c637a1984c1915c750b2 Enable e1000 in rhel9 as unsupported
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 012c983ff..779452df8 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -5489,12 +5489,15 @@ 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 ee2c89f75..c5424ddeb 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4417,14 +4417,17 @@ 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 cb6b7601f..990707698 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -5465,12 +5465,15 @@ 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 72755bf9c..05a993473 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4395,14 +4395,17 @@ 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 b4f64cf0b..e2f56d0d1 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -5592,12 +5592,15 @@ 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 d09e0f1bf..979f8d790 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -5569,12 +5569,15 @@ 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 2dcb6be46..d07d047be 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -5458,12 +5458,15 @@ 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 a139c0f98..884547e8b 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -5435,12 +5435,15 @@ 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 f49bd2aa8..a367d44cb 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -4977,12 +4977,15 @@ 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 983a2faef..47d0b174a 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -4954,12 +4954,15 @@ 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 d8cbd2476..16594cd3a 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -4684,12 +4684,15 @@ 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 a2f96d6f2..b873fc9d3 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4217,14 +4217,17 @@ 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 f3badb359..7d7fe83c9 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -4660,12 +4660,15 @@ 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 288b24cab..cff018efc 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -4199,14 +4199,17 @@ 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 72a7436b6..3e00f2a7b 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -4620,12 +4620,15 @@ 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 439d19f0a..2e5d569c2 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4153,14 +4153,17 @@ 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 2a265a9f9..c049bbc37 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -4596,12 +4596,15 @@ 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 b2c521a27..2b044bfc0 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -4135,14 +4135,17 @@ 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 447f16a1c..11cbc1a99 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -4157,14 +4157,17 @@ 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 7355677d6..84f6f1a91 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5020,12 +5020,15 @@ 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 25b54bdfe..ac72c1125 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4392,14 +4392,17 @@ 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 6b770bb4f..e927c5d6c 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -4997,12 +4997,15 @@ 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 ef17d0353..9fbacdccb 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4371,14 +4371,17 @@ 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 0c85ecf4a..65968ecce 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.rc1.20211115git8ab774587903.14
+%global distro_build 0.rc1.20211118git42eb8fdac2fc.16
%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.rc1.20211115git8ab774587903.14
+%define pkgrelease 0.rc1.20211118git42eb8fdac2fc.16
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20211115git8ab774587903.14%{?buildid}%{?dist}
+%define specrelease 0.rc1.20211118git42eb8fdac2fc.16%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -469,7 +469,6 @@ Summary: The Linux kernel
%endif
%ifarch aarch64
-%define with_selftests 0
%define all_arch_configs kernel-%{version}-aarch64*.config
%define asmarch arm64
%define hdrarch arm64
@@ -683,7 +682,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc1-3-g8ab774587903.tar.xz
+Source0: linux-5.16-rc1-21-g42eb8fdac2fc.tar.xz
Source1: Makefile.rhelver
@@ -1375,8 +1374,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc1-3-g8ab774587903 -c
-mv linux-5.16-rc1-3-g8ab774587903 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc1-21-g42eb8fdac2fc -c
+mv linux-5.16-rc1-21-g42eb8fdac2fc linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2185,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 LIBBPF_DYNAMIC=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 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
%if %{with_perf}
# perf
# make sure check-headers.sh is executable
@@ -2973,6 +2972,15 @@ fi
#
#
%changelog
+* Thu Nov 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc1.20211118git42eb8fdac2fc.16]
+- kasan: test: Silence intentional read overflow warnings (Kees Cook)
+
+* Thu Nov 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc1.20211118git42eb8fdac2fc.15]
+- New configs in drivers/net/wwan (Fedora Kernel Team)
+- New configs in drivers/i2c (Fedora Kernel Team)
+- redhat/docs/index.rst: Add local build information. (Prarit Bhargava)
+- Fix up preempt configs (Justin M. Forbes)
+
* Sat Nov 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211113git66f4beaa6c1d.12]
- Turn on CONFIG_HID_NINTENDO for controller support (Dave Olsthoorn)
- Fedora: Enable MediaTek bluetooth pieces (Peter Robinson)
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index 564ad349f..a4768a413 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -65,6 +65,7 @@
kernel/panic.c | 14 +
kernel/rh_taint.c | 109 ++++++++
kernel/sysctl.c | 5 +
+ lib/test_kasan.c | 2 +
mm/cma.c | 10 +
scripts/mod/modpost.c | 8 +
scripts/tags.sh | 2 +
@@ -72,7 +73,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 74 files changed, 1381 insertions(+), 188 deletions(-)
+ 75 files changed, 1383 insertions(+), 188 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 9725c546a0d4..4d440bdcf5b9 100644
@@ -2895,6 +2896,26 @@ index 083be6af29d7..4f271712be5e 100644
*(int *)table->data = unpriv_enable;
}
return ret;
+diff --git a/lib/test_kasan.c b/lib/test_kasan.c
+index 67ed689a0b1b..0643573f8686 100644
+--- a/lib/test_kasan.c
++++ b/lib/test_kasan.c
+@@ -869,6 +869,7 @@ static void kasan_memchr(struct kunit *test)
+ ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
+
++ OPTIMIZER_HIDE_VAR(size);
+ KUNIT_EXPECT_KASAN_FAIL(test,
+ kasan_ptr_result = memchr(ptr, '1', size + 1));
+
+@@ -894,6 +895,7 @@ static void kasan_memcmp(struct kunit *test)
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
+ memset(arr, 0, sizeof(arr));
+
++ OPTIMIZER_HIDE_VAR(size);
+ KUNIT_EXPECT_KASAN_FAIL(test,
+ kasan_int_result = memcmp(ptr, arr, size+1));
+ kfree(ptr);
diff --git a/mm/cma.c b/mm/cma.c
index bc9ca8f3c487..9fa9a485eb3a 100644
--- a/mm/cma.c
@@ -3046,72 +3067,3 @@ index c88167a414b4..e65a178ff9f4 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
-From 308661b9e60dedfff8ee23bec8127680c4d7b670 Mon Sep 17 00:00:00 2001
-From: Kees Cook <keescook@chromium.org>
-Date: Mon, 15 Nov 2021 16:41:11 -0800
-Subject: [PATCH] kasan: test: Silence intentional read overflow warnings
-
-As done in commit d73dad4eb5ad ("kasan: test: bypass __alloc_size checks")
-for __write_overflow warnings, also silence some more cases that trip
-the __read_overflow warnings seen in 5.16-rc1[1]:
-
-In file included from /kisskb/src/include/linux/string.h:253,
- from /kisskb/src/include/linux/bitmap.h:10,
- from /kisskb/src/include/linux/cpumask.h:12,
- from /kisskb/src/include/linux/mm_types_task.h:14,
- from /kisskb/src/include/linux/mm_types.h:5,
- from /kisskb/src/include/linux/page-flags.h:13,
- from /kisskb/src/arch/arm64/include/asm/mte.h:14,
- from /kisskb/src/arch/arm64/include/asm/pgtable.h:12,
- from /kisskb/src/include/linux/pgtable.h:6,
- from /kisskb/src/include/linux/kasan.h:29,
- from /kisskb/src/lib/test_kasan.c:10:
-In function 'memcmp',
- inlined from 'kasan_memcmp' at /kisskb/src/lib/test_kasan.c:897:2:
-/kisskb/src/include/linux/fortify-string.h:263:25: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)
- 263 | __read_overflow();
- | ^~~~~~~~~~~~~~~~~
-In function 'memchr',
- inlined from 'kasan_memchr' at /kisskb/src/lib/test_kasan.c:872:2:
-/kisskb/src/include/linux/fortify-string.h:277:17: error: call to '__read_overflow' declared with attribute error: detected read beyond size of object (1st parameter)
- 277 | __read_overflow();
- | ^~~~~~~~~~~~~~~~~
-
-[1] http://kisskb.ellerman.id.au/kisskb/buildresult/14660585/log/
-
-Cc: Marco Elver <elver@google.com>
-Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
-Cc: Alexander Potapenko <glider@google.com>
-Cc: Andrey Konovalov <andreyknvl@gmail.com>
-Cc: Dmitry Vyukov <dvyukov@google.com>
-Cc: kasan-dev@googlegroups.com
-Fixes: d73dad4eb5ad ("kasan: test: bypass __alloc_size checks")
-Signed-off-by: Kees Cook <keescook@chromium.org>
-Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
----
- lib/test_kasan.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/test_kasan.c b/lib/test_kasan.c
-index 67ed689a0b1b..0643573f8686 100644
---- a/lib/test_kasan.c
-+++ b/lib/test_kasan.c
-@@ -869,6 +869,7 @@ static void kasan_memchr(struct kunit *test)
- ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO);
- KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
-
-+ OPTIMIZER_HIDE_VAR(size);
- KUNIT_EXPECT_KASAN_FAIL(test,
- kasan_ptr_result = memchr(ptr, '1', size + 1));
-
-@@ -894,6 +895,7 @@ static void kasan_memcmp(struct kunit *test)
- KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr);
- memset(arr, 0, sizeof(arr));
-
-+ OPTIMIZER_HIDE_VAR(size);
- KUNIT_EXPECT_KASAN_FAIL(test,
- kasan_int_result = memcmp(ptr, arr, size+1));
- kfree(ptr);
---
-2.33.1
-
diff --git a/sources b/sources
index 41b1dae20..b68da4cc3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc1-3-g8ab774587903.tar.xz) = a4064c0b97c341e1d4ef75fb9606c6a306814043278e98c5e836e789e8ea43d533b2660ed3fb564ca938c5608684eea89acaae0da53a83e97be7c6f20c363558
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc1.20211115git8ab774587903.14.tar.bz2) = db5afd17a1517a374f9b4fbe0d5c788f9ac16cac0f9807a552e222e93c9502d132a2c8b36edcc162122f2bdd6597b16f60c11d67426793dfe86c8efc0648009e
-SHA512 (kernel-kabi-dw-5.16.0-0.rc1.20211115git8ab774587903.14.tar.bz2) = ffe84fc725dbc6ee7dbc357783f67a831d4f813f4de330453f42a4a7d216e1430c0b17973b96ed53e62d72ba61aa83d6585babb6b5975d7572b58815f7730f2b
+SHA512 (linux-5.16-rc1-21-g42eb8fdac2fc.tar.xz) = 16e9525200fa55835f1d7ce7fe4e03a9058ec0b9943ab286cd3ca776709a8f30314e3c3f06748be15cbc0931ce9697511cf4a96e503dfc74e3feb22576d037ff
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc1.20211118git42eb8fdac2fc.16.tar.bz2) = d1be0805c89447d17515ff7e6b00f063c655ac4fa207d040779d267664ce6b56c174cfd7c186787e9a163451e249239a00d331e69ab3a2a70b0ad19098201c34
+SHA512 (kernel-kabi-dw-5.16.0-0.rc1.20211118git42eb8fdac2fc.16.tar.bz2) = 626bffaa3f4f81645d4774ae679a73be049434598fe69f87eda1f66333431dd64da4a70bee1371173d141df714c8ab2f1eb4dd0d05f01becc4ab632b904e5886