summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-01-30 18:40:08 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-01-30 18:40:08 +0100
commitb7accfefcecf13b2d477cb24d01016c73fe03fe9 (patch)
treed4841b55196d770def9ac377ba9f05b1779b0c95
parent0ba20cb7f23e1e47882f44add1a539db285fe604 (diff)
parentf760a275cec0a8dda88e2cde5c0cd8fc133283cc (diff)
downloadkernel-b7accfefcecf13b2d477cb24d01016c73fe03fe9.tar.gz
kernel-b7accfefcecf13b2d477cb24d01016c73fe03fe9.tar.xz
kernel-b7accfefcecf13b2d477cb24d01016c73fe03fe9.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc2.83.vanilla.1.fc36kernel-5.17.0-0.rc2.83.vanilla.1.fc35kernel-5.17.0-0.rc2.83.vanilla.1.fc34
-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.config4
-rw-r--r--kernel-s390x-debug-rhel.config4
-rw-r--r--kernel-s390x-fedora.config4
-rw-r--r--kernel-s390x-rhel.config4
-rw-r--r--kernel-s390x-zfcpdump-rhel.config4
-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.spec18
-rw-r--r--patch-5.17-redhat.patch62
-rw-r--r--sources6
28 files changed, 95 insertions, 70 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 7afb13dc6..713eae79d 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 = 79
+RHEL_RELEASE = 83
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index ca026b0f5..8a2c34b09 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/93296c8913585b0fef445615f3a13d8f42a85898
+ 93296c8913585b0fef445615f3a13d8f42a85898 Workaround for gcc12 compile issues in ubcmd-util.h
+
https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b
4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 900f45a65..eb9d86116 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -339,6 +339,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1291,7 +1292,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -5983,6 +5983,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SATA_ACARD_AHCI=m
CONFIG_SATA_AHCI_PLATFORM=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 13fa18fc8..c0e43957a 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -268,6 +268,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -959,7 +960,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
CONFIG_CRYPTO_CRC32C=y
@@ -4664,6 +4664,7 @@ CONFIG_RTW89_DEBUGMSG=y
CONFIG_RTW89=m
CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
# CONFIG_SATA_ACARD_AHCI is not set
CONFIG_SATA_AHCI_PLATFORM=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 3adc3c257..d6bc17e2d 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -339,6 +339,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1291,7 +1292,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -5958,6 +5958,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SATA_ACARD_AHCI=m
CONFIG_SATA_AHCI_PLATFORM=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 2d1bbbacb..71a72864b 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -268,6 +268,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -959,7 +960,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
CONFIG_CRYPTO_CRC32C=y
@@ -4641,6 +4641,7 @@ CONFIG_RTW89_8852AE=m
CONFIG_RTW89=m
CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
# CONFIG_SATA_ACARD_AHCI is not set
CONFIG_SATA_AHCI_PLATFORM=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 8cfce28c6..7d8bd5e4d 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -347,6 +347,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1288,7 +1289,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -6106,6 +6106,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S3C2410_WATCHDOG=m
# CONFIG_SAMPLES is not set
CONFIG_SATA_ACARD_AHCI=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 50429de8c..182d4e027 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -347,6 +347,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1288,7 +1289,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -6082,6 +6082,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S3C2410_WATCHDOG=m
# CONFIG_SAMPLES is not set
CONFIG_SATA_ACARD_AHCI=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index d49d4d367..ecbb45dee 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -339,6 +339,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1260,7 +1261,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -5928,6 +5928,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S3C2410_WATCHDOG=m
# CONFIG_SAMPLES is not set
CONFIG_SATA_ACARD_AHCI=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index c08afb2e3..87259ef88 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -339,6 +339,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1260,7 +1261,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -5904,6 +5904,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S3C2410_WATCHDOG=m
# CONFIG_SAMPLES is not set
CONFIG_SATA_ACARD_AHCI=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index c63f86a0a..ba46b9bfc 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -296,6 +296,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1037,7 +1038,6 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -5326,6 +5326,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SAMSUNG_LAPTOP=m
CONFIG_SAMSUNG_Q10=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 927633871..881b13b75 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -296,6 +296,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1036,7 +1037,6 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -5302,6 +5302,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SAMSUNG_LAPTOP=m
CONFIG_SAMSUNG_Q10=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c17f682a3..2decaea3b 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -260,6 +260,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -988,7 +989,6 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
CONFIG_CRYPTO_CRC32C=y
@@ -5044,6 +5044,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SATA_ACARD_AHCI=m
CONFIG_SATA_AHCI_PLATFORM=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index c585c340e..d10319c7f 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -220,6 +220,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -819,7 +820,6 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
CONFIG_CRYPTO_CRC32C=y
@@ -4458,6 +4458,7 @@ CONFIG_RTW89_DEBUGMSG=y
CONFIG_RTW89=m
CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
# CONFIG_SATA_ACARD_AHCI is not set
CONFIG_SATA_AHCI=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 32f62d7ae..7d7ee39e5 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -260,6 +260,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -987,7 +988,6 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
CONFIG_CRYPTO_CRC32C=y
@@ -5019,6 +5019,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SATA_ACARD_AHCI=m
CONFIG_SATA_AHCI_PLATFORM=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 2313c74a4..ad250d4a2 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -220,6 +220,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -819,7 +820,6 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
CONFIG_CRYPTO_CRC32C=y
@@ -4439,6 +4439,7 @@ CONFIG_RTW89_8852AE=m
CONFIG_RTW89=m
CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
# CONFIG_SATA_ACARD_AHCI is not set
CONFIG_SATA_AHCI=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index df71380c6..1328b5a94 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -264,6 +264,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -995,7 +996,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
+CONFIG_CRYPTO_CHACHA_S390=m
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
CONFIG_CRYPTO_CRC32C=y
@@ -4983,6 +4984,7 @@ CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
CONFIG_S390_TAPE_34XX=m
CONFIG_S390_TAPE_3590=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index d6489480a..eb795a7c4 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -220,6 +220,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -819,7 +820,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
+CONFIG_CRYPTO_CHACHA_S390=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
CONFIG_CRYPTO_CRC32C=y
@@ -4397,6 +4398,7 @@ CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
CONFIG_S390_TAPE_34XX=m
CONFIG_S390_TAPE_3590=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 4ef590a7a..7648436af 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -264,6 +264,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -994,7 +995,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
+CONFIG_CRYPTO_CHACHA_S390=m
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m
CONFIG_CRYPTO_CRC32C=y
@@ -4958,6 +4959,7 @@ CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
CONFIG_S390_TAPE_34XX=m
CONFIG_S390_TAPE_3590=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 33f273b03..710c7b0c3 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -220,6 +220,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -819,7 +820,7 @@ CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
+CONFIG_CRYPTO_CHACHA_S390=m
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
CONFIG_CRYPTO_CRC32C=y
@@ -4378,6 +4379,7 @@ CONFIG_S390_CCW_IOMMU=y
CONFIG_S390_GUEST=y
CONFIG_S390_HYPFS_FS=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=m
CONFIG_S390_TAPE_34XX=m
CONFIG_S390_TAPE_3590=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index e183e1c47..e9b705de3 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -220,6 +220,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -824,7 +825,7 @@ CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y
CONFIG_CRYPTO_CHACHA20=y
-# CONFIG_CRYPTO_CHACHA_S390 is not set
+CONFIG_CRYPTO_CHACHA_S390=y
CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
CONFIG_CRYPTO_CRC32C=y
@@ -4396,6 +4397,7 @@ CONFIG_S390_CCW_IOMMU=y
# CONFIG_S390_GUEST is not set
# CONFIG_S390_HYPFS_FS is not set
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
CONFIG_S390_PRNG=y
CONFIG_S390_TAPE_34XX=m
CONFIG_S390_TAPE_3590=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index a9e9d7edc..487b97a9c 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -298,6 +298,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1060,7 +1061,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -5371,6 +5371,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SAMSUNG_LAPTOP=m
CONFIG_SAMSUNG_Q10=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index c56cd1031..f493a7757 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -243,6 +243,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -858,7 +859,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -4622,6 +4622,7 @@ CONFIG_RTW89_DEBUGMSG=y
CONFIG_RTW89=m
CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SAMSUNG_LAPTOP=m
CONFIG_SAMSUNG_Q10=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index f2b485b80..4a85baaec 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -298,6 +298,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -1059,7 +1060,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32C_VPMSUM=m
@@ -5347,6 +5347,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y
CONFIG_S2IO=m
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SAMSUNG_LAPTOP=m
CONFIG_SAMSUNG_Q10=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 39054aa18..e27998696 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -243,6 +243,7 @@ CONFIG_ARM64_EPAN=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+# CONFIG_ARM64_ERRATUM_2051678 is not set
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2119858=y
@@ -858,7 +859,6 @@ CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y
-# CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@@ -4600,6 +4600,7 @@ CONFIG_RTW89_8852AE=m
CONFIG_RTW89=m
CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_S390_KPROBES_SANITY_TEST is not set
+# CONFIG_S390_MODULES_SANITY_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_SAMSUNG_LAPTOP=m
CONFIG_SAMSUNG_Q10=m
diff --git a/kernel.spec b/kernel.spec
index 177137d2c..84ed3b381 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc1.20220128git145d9b498fc8.79
+%global distro_build 0.rc2.83
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc1.20220128git145d9b498fc8.79
+%define pkgrelease 0.rc2.83
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20220128git145d9b498fc8.79%{?buildid}%{?dist}
+%define specrelease 0.rc2.83%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -694,7 +694,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-rc1-230-g145d9b498fc8.tar.xz
+Source0: linux-5.17-rc2.tar.xz
Source1: Makefile.rhelver
@@ -1395,8 +1395,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17-rc1-230-g145d9b498fc8 -c
-mv linux-5.17-rc1-230-g145d9b498fc8 linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc2 -c
+mv linux-5.17-rc2 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -3019,6 +3019,12 @@ fi
#
#
%changelog
+* Sun Jan 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc2.83]
+- Workaround for gcc12 compile issues in ubcmd-util.h (Justin M. Forbes)
+
+* Sat Jan 29 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc1.20220129git169387e2aa29.80]
+- New configs in drivers/crypto (Fedora Kernel Team)
+
* Fri Jan 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc1.20220128git145d9b498fc8.79]
- Add test_hash to the mod-internal.list (Justin M. Forbes)
- configs: disable CONFIG_CRAMFS (Abhi Das) [2041184]
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index 90d82574b..9529dbb10 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -72,8 +72,9 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
+ tools/lib/subcmd/subcmd-util.h | 9 +-
tools/objtool/check.c | 2 +-
- 75 files changed, 1513 insertions(+), 189 deletions(-)
+ 76 files changed, 1517 insertions(+), 194 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index f5a27f067db9..f4dc42f2f82a 100644
@@ -129,7 +130,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 0fb4f94a6885..f19ab6b40583 100644
+index 1fc3491096cb..cabf37d9d6ec 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -159,10 +160,10 @@ index 0fb4f94a6885..f19ab6b40583 100644
$(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index fabe39169b12..bfd2929ab514 100644
+index 4c97cb40eebb..caf06cef3d2e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1478,9 +1478,9 @@ config HIGHMEM
+@@ -1479,9 +1479,9 @@ config HIGHMEM
If unsure, say n.
config HIGHPTE
@@ -175,10 +176,10 @@ index fabe39169b12..bfd2929ab514 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 6978140edfa4..a9c3542c2577 100644
+index f2b5a4abef21..ccff5b146754 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -1023,7 +1023,7 @@ endchoice
+@@ -1092,7 +1092,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@@ -187,7 +188,7 @@ index 6978140edfa4..a9c3542c2577 100644
help
For systems with 52-bit userspace VAs enabled, the kernel will attempt
to maintain compatibility with older software by providing 48-bit VAs
-@@ -1265,6 +1265,7 @@ config XEN
+@@ -1334,6 +1334,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if ARM64_64K_PAGES
@@ -851,7 +852,7 @@ index c02ff25dd477..d860f8eb9a81 100644
obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o
obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index ae79c3300129..e9205ea7aeb3 100644
+index 7de3f5b6e8d0..95b1c35b347c 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -31,6 +31,7 @@
@@ -862,7 +863,7 @@ index ae79c3300129..e9205ea7aeb3 100644
#include <asm/early_ioremap.h>
-@@ -844,40 +845,101 @@ int efi_mem_type(unsigned long phys_addr)
+@@ -851,40 +852,101 @@ int efi_mem_type(unsigned long phys_addr)
}
#endif
@@ -2234,7 +2235,7 @@ index 33f47a996513..7a716c0b05bc 100644
+
#endif
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
-index a5a724c308d8..7d560b86c195 100644
+index 819ec92dc2a8..b49986bfbeca 100644
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
@@ -392,6 +392,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
@@ -3158,10 +3159,10 @@ index 87cbdc64d272..18555cf18da7 100644
static int __init lockdown_lsm_init(void)
diff --git a/security/security.c b/security/security.c
-index 3d4eb474f35b..c02f1aa3ff64 100644
+index 22261d79f333..20336365f864 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -2592,6 +2592,12 @@ int security_locked_down(enum lockdown_reason what)
+@@ -2603,6 +2603,12 @@ int security_locked_down(enum lockdown_reason what)
}
EXPORT_SYMBOL(security_locked_down);
@@ -3174,29 +3175,6 @@ index 3d4eb474f35b..c02f1aa3ff64 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
-diff --git a/tools/objtool/check.c b/tools/objtool/check.c
-index c2d2ab9a2861..f5bed94e4558 100644
---- a/tools/objtool/check.c
-+++ b/tools/objtool/check.c
-@@ -2854,7 +2854,7 @@ static inline bool func_uaccess_safe(struct symbol *func)
-
- static inline const char *call_dest_name(struct instruction *insn)
- {
-- static char pvname[16];
-+ static char pvname[32];
- struct reloc *rel;
- int idx;
-
-From b3d2907a37c53f7379be8742bfbfe47aa2877bfc Mon Sep 17 00:00:00 2001
-From: "Justin M. Forbes" <jforbes@fedoraproject.org>
-Date: Thu, 27 Jan 2022 15:33:37 -0600
-Subject: [PATCH] Fix subcmd-util for gcc 12
-
-Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
----
- tools/lib/subcmd/subcmd-util.h | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
diff --git a/tools/lib/subcmd/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h
index 794a375dad36..7009fc176636 100644
--- a/tools/lib/subcmd/subcmd-util.h
@@ -3219,6 +3197,16 @@ index 794a375dad36..7009fc176636 100644
if (!ret)
die("Out of memory, realloc failed");
}
---
-2.34.1
+diff --git a/tools/objtool/check.c b/tools/objtool/check.c
+index c2d2ab9a2861..f5bed94e4558 100644
+--- a/tools/objtool/check.c
++++ b/tools/objtool/check.c
+@@ -2854,7 +2854,7 @@ static inline bool func_uaccess_safe(struct symbol *func)
+
+ static inline const char *call_dest_name(struct instruction *insn)
+ {
+- static char pvname[16];
++ static char pvname[32];
+ struct reloc *rel;
+ int idx;
diff --git a/sources b/sources
index c3eaf7661..2ebf6bbc5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc1-230-g145d9b498fc8.tar.xz) = c01c770e8695808e64e3b0576dc03d09c40e9acd0496cfde81473057f42669fb55db8d0ee7ea4176236220c6d6763c62bf9aa00c7baf674dbecf1c402b87ee52
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc1.20220128git145d9b498fc8.79.tar.bz2) = 3798b129649a93e78355e0d4e21e8ff23637cf4199f5b34ecaf5295d10c690424832e673fd13864d5cd314f4e5f48d39831999aa8c0a0970fe17b1c908447ad7
-SHA512 (kernel-kabi-dw-5.17.0-0.rc1.20220128git145d9b498fc8.79.tar.bz2) = a6e26cfe5a70fe13d6fcb92dde6099e93c3edae1618f25d026342e4d0914ff297be234951f23b3e14ccd211dc91f5f1bbaf39c87901e47f8848b988ae9c0edd0
+SHA512 (linux-5.17-rc2.tar.xz) = b4b7d3aee7977fe934c5a313276b4ceba69f5660fdf2a40bbfee2a36500d49a2568e3c7cb2300019bd4fda89c4aed8ab8202a34b6dd440865cb83f711d2782dd
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc2.83.tar.bz2) = 0b3dad7604212950a3416327cac215bc8b5cba6ed3bc48ae28cdb04fff2bfaedb422e8d4be5bf9e18b56923caf606719885c3027b7c916835ba5f7ced265ab3a
+SHA512 (kernel-kabi-dw-5.17.0-0.rc2.83.tar.bz2) = 796787262bf18cf7510b1a4f6d37f4f6cfa2b390ab73007a337d82ec78710d23a516e308035d2f475ac1aa3aedc3ef9d9221299cc1bbd719421d36e8829729e2