diff --git a/Makefile.rhelver b/Makefile.rhelver index 8bdbd5dd1..9e1fac485 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 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index dd639e566..8054cf739 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -3861,7 +3861,7 @@ CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 6e86e0724..2a405850c 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -3836,7 +3836,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 7eb1f72d8..f26b717e1 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3206,7 +3206,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 1660f9a98..559125596 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3184,7 +3184,7 @@ CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index ff33fdf2e..8d66e325e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3861,7 +3861,7 @@ CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 78c94c1c1..20b906652 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3202,7 +3202,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 8649a7b26..b371845a7 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3836,7 +3836,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index caf32fa7e..e6d10a5b6 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3180,7 +3180,7 @@ CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index fefbb85a2..875cbd4b5 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3242,7 +3242,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 42c6a10a4..556cb3c28 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3220,7 +3220,7 @@ CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index d10f75f85..dbd1ef0cc 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3167,7 +3167,7 @@ CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 5c246da52..c8f7405f9 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2885,7 +2885,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 95372982d..105c570dd 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3140,7 +3140,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 79b19012e..f7609c91c 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2864,7 +2864,7 @@ CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index dc6d8f831..df158085e 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3139,7 +3139,7 @@ CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index bca664689..59005f972 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2869,7 +2869,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index bb9ccc58a..94ef63a3f 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3112,7 +3112,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 444ce803f..3371ea5e9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2848,7 +2848,7 @@ CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 2428308f0..5945cb76f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2857,7 +2857,7 @@ CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS is not set # CONFIG_KEYS_REQUEST_CACHE is not set # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 3e3ea612e..3028b7fc9 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3467,7 +3467,7 @@ CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 5f8713fb8..20f2ff8d4 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3065,7 +3065,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index fa747ac32..a1bb32ff9 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3440,7 +3440,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 56a9a1e0b..8e102f41e 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3044,7 +3044,7 @@ CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 8a655ee9d..da48c6e2f 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3105,7 +3105,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 0fbce12d4..5c7a7488e 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3084,7 +3084,7 @@ CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set -# CONFIG_KFENCE_KUNIT_TEST is not set +CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 CONFIG_KFENCE_SAMPLE_INTERVAL=100 # CONFIG_KFENCE_STATIC_KEYS is not set diff --git a/kernel.spec b/kernel.spec index 536370e26..e01ec2739 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc5.41 +%define pkgrelease 0.rc5.20231212git26aff849438c.42 %define kversion 6 -%define tarfile_release 6.7-rc5 +%define tarfile_release 6.7-rc5-14-g26aff849438c # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.41%{?buildid}%{?dist} +%define specrelease 0.rc5.20231212git26aff849438c.42%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3754,6 +3754,10 @@ fi\ # # %changelog +* Tue Dec 12 2023 Fedora Kernel Team [6.7.0-0.rc5.26aff849438c.42] +- redhat: enable the kfence test (Nico Pache) +- Linux v6.7.0-0.rc5.26aff849438c + * Mon Dec 11 2023 Fedora Kernel Team [6.7.0-0.rc5.41] - redhat/configs: Enable UCLAMP_TASK for PipeWire and WirePlumber (Neal Gompa) - Linux v6.7.0-0.rc5 diff --git a/sources b/sources index 54ed59fb7..15c2d880c 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.7-rc5.tar.xz) = 55e874b5921c97595d0a7043dbb8a60bfbb2a12ecee34e75c6fc73470d904eff86e76615d11750bf8f3c66b679c6a4585dcfb4a8d6fa7186db86fb14913ad0ce -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = ea325c071be93cadc4a4b2fdee91082bf025f1e371574d83598be9d0ec91e8fd4525a0d6d36ad0792afc4a31f711dbef46d12c631863602e2a6e267474d30b32 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 0757fc5551d92430b76d37f2c7ae3319617f82bc583bb12a953ccbd2ef2182a858751509aa0a568aa3d79307563a1f2a8a6f10351cefe2b0438bc56329c0f9dd +SHA512 (linux-6.7-rc5-14-g26aff849438c.tar.xz) = d55ba052d6955450b17f29c33727a927df1c52b62705e0d080637cf385b6742be4c74e3437f240ba0eeb6d622a1728ef612f61dd5d3891d5f223fa057601daec +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 85bd0c37af8ec9afe7f6a521bd4bfff75df1390ae0e043c8c38f07ec0690efff3f785bf6291a334b58d74677cdff52bb73f7dcb7b14cef445b6b4d97c94c5dbe +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 500a21354926ad105cc6b32db608a9c2b96fd55b3dc06e6c871d3ff2c35a377b0d8fc91c6151db04113c77984d5d4a4131ae63bee466b55f221516f6c03f6743