diff --git a/Makefile.rhelver b/Makefile.rhelver index a181a77cc..9ff2043ca 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 = 9 +RHEL_RELEASE = 10 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index d6a56e776..51c7fa4a5 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -3861,6 +3861,7 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KUSER_HELPERS=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set CONFIG_KVM_XEN=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 8ec6fb5d6..b894e8c32 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -3837,6 +3837,7 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KUSER_HELPERS=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set CONFIG_KVM_XEN=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 96506dc9f..face75c11 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3138,6 +3138,7 @@ CONFIG_KUNIT_TEST=m CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 67e1eada3..135f1dc51 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3117,6 +3117,7 @@ CONFIG_KUNIT_TEST=m CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 2e4f28270..1d76369b4 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3861,6 +3861,7 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KUSER_HELPERS=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set CONFIG_KVM_XEN=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 3eafc03df..860b4973d 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3134,6 +3134,7 @@ CONFIG_KUNIT_TEST=m CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 7d855be25..1a3ab1b8f 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3837,6 +3837,7 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KUSER_HELPERS=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set CONFIG_KVM_XEN=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 28824b547..04e7144c1 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3113,6 +3113,7 @@ CONFIG_KUNIT_TEST=m CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 81fd70207..7058eb0ca 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3174,6 +3174,7 @@ CONFIG_KUNIT_TEST=m CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 543926457..4221ec617 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3153,6 +3153,7 @@ CONFIG_KUNIT_TEST=m CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 84cfbbe50..e9f8f23fd 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3171,6 +3171,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_GUEST=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set CONFIG_KVM_XEN=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 60a47d369..f284d3d91 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2846,6 +2846,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_BOOK3S_PR_POSSIBLE=y CONFIG_KVM_GUEST=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 6a5b6dee3..e95bd95b8 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3145,6 +3145,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_GUEST=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set CONFIG_KVM_XEN=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index aef66ad94..242a9aba6 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2826,6 +2826,7 @@ CONFIG_KVM_BOOK3S_HV_NESTED_PMU_WORKAROUND=y # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM_BOOK3S_PR_POSSIBLE=y CONFIG_KVM_GUEST=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 09268a5bc..a8ff5dbd3 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3138,6 +3138,7 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KVM=m +# CONFIG_KVM_PROVE_MMU is not set # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 014e93f4a..0eee258af 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2826,6 +2826,7 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM=m +# CONFIG_KVM_PROVE_MMU is not set # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 5f4903ea8..b6555b428 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3112,6 +3112,7 @@ CONFIG_KUNIT=m CONFIG_KUNIT_TEST=m # CONFIG_KUNPENG_HCCS is not set CONFIG_KVM=m +# CONFIG_KVM_PROVE_MMU is not set # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 394a2f161..7d76c05e7 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2806,6 +2806,7 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set CONFIG_KVM=m +# CONFIG_KVM_PROVE_MMU is not set # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 15922e0df..395cf4d99 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2815,6 +2815,7 @@ CONFIG_KVM_AMD_SEV=y # CONFIG_KVM_BOOK3S_HV_P8_TIMING is not set # CONFIG_KVM_BOOK3S_HV_P9_TIMING is not set # CONFIG_KVM is not set +# CONFIG_KVM_PROVE_MMU is not set # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 7124342a7..184a797af 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3467,6 +3467,7 @@ CONFIG_KVM_GUEST=y CONFIG_KVM_INTEL=m CONFIG_KVM=m CONFIG_KVM_MMU_AUDIT=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set CONFIG_KVM_XEN=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 4f09f9cdd..2ca0ad10c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3022,6 +3022,7 @@ CONFIG_KVM_GUEST=y CONFIG_KVM_INTEL=m CONFIG_KVM=m CONFIG_KVM_MMU_AUDIT=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index c39d3ec38..a859d1938 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3441,6 +3441,7 @@ CONFIG_KVM_GUEST=y CONFIG_KVM_INTEL=m CONFIG_KVM=m CONFIG_KVM_MMU_AUDIT=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set CONFIG_KVM_XEN=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index e2c70001e..c96de2b92 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3002,6 +3002,7 @@ CONFIG_KVM_GUEST=y CONFIG_KVM_INTEL=m CONFIG_KVM=m CONFIG_KVM_MMU_AUDIT=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 0d973cfb3..41c7a1653 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3062,6 +3062,7 @@ CONFIG_KVM_GUEST=y CONFIG_KVM_INTEL=m CONFIG_KVM=m CONFIG_KVM_MMU_AUDIT=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index f6b689135..dd5e875b9 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3042,6 +3042,7 @@ CONFIG_KVM_GUEST=y CONFIG_KVM_INTEL=m CONFIG_KVM=m CONFIG_KVM_MMU_AUDIT=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set diff --git a/kernel.spec b/kernel.spec index e6de90b8d..8b9b87ff4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.6.0 %define specversion 6.6.0 %define patchversion 6.6 -%define pkgrelease 0.rc0.20230907git7ba2090ca64e.9 +%define pkgrelease 0.rc0.20230908gita48fa7efaf11.10 %define kversion 6 -%define tarfile_release 6.5-12107-g7ba2090ca64e +%define tarfile_release 6.5-12728-ga48fa7efaf11 # This is needed to do merge window version magic %define patchlevel 6 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20230907git7ba2090ca64e.9%{?buildid}%{?dist} +%define specrelease 0.rc0.20230908gita48fa7efaf11.10%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.6.0 @@ -3694,6 +3694,9 @@ fi\ # # %changelog +* Fri Sep 08 2023 Fedora Kernel Team [6.6.0-0.rc0.a48fa7efaf11.10] +- Linux v6.6.0-0.rc0.a48fa7efaf11 + * Thu Sep 07 2023 Fedora Kernel Team [6.6.0-0.rc0.7ba2090ca64e.9] - Fix Fedora release scheduled job (Don Zickus) - Move squashfs to kernel-modules-core (Justin M. Forbes) diff --git a/patch-6.6-redhat.patch b/patch-6.6-redhat.patch index e29d33858..53c7ea6fc 100644 --- a/patch-6.6-redhat.patch +++ b/patch-6.6-redhat.patch @@ -212,7 +212,7 @@ index 05e51666db03..454a33b77878 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index c744104e4a9c..8e3e8c976991 100644 +index de6ad0fb2328..5cc2758be027 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -223,7 +223,7 @@ index c744104e4a9c..8e3e8c976991 100644 #include #include -@@ -915,6 +916,9 @@ void __init setup_arch(char **cmdline_p) +@@ -914,6 +915,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -2464,7 +2464,7 @@ index 3947122d618b..5b9462a450a1 100644 obj-$(CONFIG_MULTIUSER) += groups.o obj-$(CONFIG_VHOST_TASK) += vhost_task.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index ebeb0695305a..f776e028c798 100644 +index eb01c31ed591..8a85897c7ea0 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ diff --git a/sources b/sources index 6d5fe6fe2..02811c7c3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-12107-g7ba2090ca64e.tar.xz) = f81a765e0d447c4a5441570da83ba960cdf204dc8c596ac0ed7b8bc41cb26c1eaec770a923bc9027513c36ded6d74330ce96aeb0f5635d7746cbb0c349b5775b -SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = a00948723580272d10e53e85c320a8bf033388205e824e11df6e14f49daa3d3106cd99e59ce89373f03e7c9b380279b8c4b1534e4ebcbb441fce8ac64ead5645 -SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = cf2ae846226b70916c8782576deb399d355a31aad66aa162190e6cd8f26c20ae87daf73b1b9d3b4d6092c9a4d9d3414783c5449063cf7099e1dd8fa74905d827 +SHA512 (linux-6.5-12728-ga48fa7efaf11.tar.xz) = b6699f179bee00c577fca70538ac4284cf63a8f4a7104ad7e50fe1abda16e97de0ec147e1b325ab9be1839710a6c8bc5a0ba16f8ba80784867f80cc60093b1b3 +SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4c90ee9bcde04eaba402b3901be1b395a99a4060fd5e592a6dd592616e5c72f934c80a1c56b2f471f2aab27e2a7675da198e2bb4bf7bf470d86beed4fdba0158 +SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 172dce7249bd20c3264f5da9c3edb1fd2d899b7d2467fef02ae7c7d315a383098a1efdf6503ae0cb25507f67fbc4762cba3594f8343b1c36d0d87c652f1a991a