24 files changed, 53 insertions, 38 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 616f1636b..645be0a98 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 = 41
+RHEL_RELEASE = 42
 
 #
 # ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 8a5fd2f90..41549c490 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -5611,7 +5611,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 0cd7372d4..e25ee53d6 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -6154,9 +6154,10 @@ CONFIG_TCG_CRB=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
 CONFIG_TCG_TIS_I2C_NUVOTON=m
-# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_I2C=y
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index d57b0cb32..4a5be3072 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -5590,7 +5590,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 835700903..06c3e7ca2 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -6129,9 +6129,10 @@ CONFIG_TCG_CRB=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
 CONFIG_TCG_TIS_I2C_NUVOTON=m
-# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_I2C=y
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 3c904de76..8a4c9d352 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -5626,7 +5626,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 435762845..f460518df 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -5607,7 +5607,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 617be762e..1323f5f24 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -5498,7 +5498,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 8a6b1121f..dcf616248 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -5479,7 +5479,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 4e16216da..657e3e101 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -4713,7 +4713,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 944474cd8..40c82dd02 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -5918,9 +5918,10 @@ CONFIG_TCG_IBMVTPM=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
 CONFIG_TCG_TIS_I2C_NUVOTON=y
-# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_I2C=y
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index d6507c28d..ef3733dc6 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -4692,7 +4692,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 86934945a..2e500c787 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -5895,9 +5895,10 @@ CONFIG_TCG_IBMVTPM=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
 CONFIG_TCG_TIS_I2C_NUVOTON=y
-# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_I2C=y
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 70b0af1d8..08eb9b1bb 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -4647,7 +4647,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 4256b0ed1..d5d9b5498 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -5890,9 +5890,10 @@ CONFIG_TCG_CRB=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
+CONFIG_TCG_TIS_I2C=m
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
-# CONFIG_TCG_TIS_SPI is not set
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index ab5503086..ee2989784 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -4626,7 +4626,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 383165019..e4e09b962 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -5867,9 +5867,10 @@ CONFIG_TCG_CRB=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
+CONFIG_TCG_TIS_I2C=m
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
-# CONFIG_TCG_TIS_SPI is not set
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index f74b6b96e..d77477c3d 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -5892,9 +5892,10 @@ CONFIG_TCG_CRB=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
+CONFIG_TCG_TIS_I2C=m
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
-# CONFIG_TCG_TIS_SPI is not set
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 218a6591d..15fe1a541 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5045,7 +5045,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 27a988c7f..1fe335be2 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -6134,9 +6134,10 @@ CONFIG_TCG_CRB=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
 CONFIG_TCG_TIS_I2C_NUVOTON=m
-# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_I2C=y
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index ce0c28ec7..c2c815853 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5025,7 +5025,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_PRINTER=m
 # CONFIG_PRINTK_CALLER is not set
-# CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_INDEX=y
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 71ccb5891..76dcb6bd7 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -6110,9 +6110,10 @@ CONFIG_TCG_CRB=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_CR50=m
 # CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C is not set
 CONFIG_TCG_TIS_I2C_NUVOTON=m
-# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_I2C=y
+# CONFIG_TCG_TIS_SPI_CR50 is not set
+CONFIG_TCG_TIS_SPI=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_TCG_TIS=y
diff --git a/kernel.spec b/kernel.spec
index 7cde82f32..d5a3da3e0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,17 +124,17 @@ 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
 # define buildid .local
 %define specversion 6.0.0
 %define patchversion 6.0
-%define pkgrelease 0.rc6.41
+%define pkgrelease 0.rc6.20220921git60891ec99e14.42
 %define kversion 6
-%define tarfile_release 6.0-rc6
+%define tarfile_release 6.0-rc6-9-g60891ec99e14
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.41%{?buildid}%{?dist}
+%define specrelease 0.rc6.20220921git60891ec99e14.42%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.0.0
 
@@ -3159,6 +3159,12 @@ fi
 #
 #
 %changelog
+* Wed Sep 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc6.60891ec99e14.42]
+- redhat/self-test: Ignore .rhpkg.mk files (Prarit Bhargava)
+- redhat/configs: Enable CONFIG_PRINTK_INDEX on Fedora (Prarit Bhargava)
+- redhat/configs: Cleanup CONFIG_X86_KERNEL_IBT (Prarit Bhargava)
+- Linux v6.0.0-0.rc6.60891ec99e14
+
 * Mon Sep 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc6.41]
 - Linux v6.0.0-0.rc6
 
diff --git a/sources b/sources
index abd89af9e..9fe4f76fd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0-rc6.tar.xz) = 4eab81b9505f77845ddd5f5c0ee99823c6fb623762b88de5b2908872c26c26f1504a76a371b5275a899f525b7aba97b6b6dbb51250c20ddba6d4e1003ae9a438
-SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 3d2bd783e4ef8bab7a8ba966cd6f6e8662bd1ab516078499d6f469e25a8dde855366db6027cfe90482d6ec1700a20912b3a38655b77175426bac9c2acfb66f9f
-SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 0273a100ab84d7f47623e57e870db545bc3d917b92cd21e01bb4bd4549843c422d1f505106650bc15d534202da52f9f09cdf1a34524fa65894fc92b2d1f5e0ff
+SHA512 (linux-6.0-rc6-9-g60891ec99e14.tar.xz) = 3b022c56260ee11341b8ad561093c74719b729de36d306d0f7080e8b2f060870bd40022c1f3d44ec650e7276947325f2355201c271b7ed6a4935603d3ebb49bc
+SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 0c43d473adad00775a66e88ce2b78f2220f85d34376a045c426b8d8080f7ed9d652995a670ebd706de50a5c88c6217996edb79bd5a81028304a273e8d571ffc2
+SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 8b1f17f0d3608a07fe1526c599935f7eb8dc2855d5ecfd7330698a47852d5cf567ead82ac32a97d5d1ce0c66097d5b42fda0b212b4f567df859edaed200fe684