diff --git a/Makefile.rhelver b/Makefile.rhelver index 3606a7785..1805083e6 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 = 12 +RHEL_RELEASE = 13 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 98476ae86..8b7be587b 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3260,7 +3260,7 @@ CONFIG_KVM_HYPERV=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set CONFIG_KVM=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 471de35be..4f735567d 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3239,7 +3239,7 @@ CONFIG_KVM_HYPERV=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set CONFIG_KVM=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 0b0f27bdb..cda7e39cc 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3256,7 +3256,7 @@ CONFIG_KVM_HYPERV=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set CONFIG_KVM=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 54239c63c..34442a970 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3235,7 +3235,7 @@ CONFIG_KVM_HYPERV=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set CONFIG_KVM=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 5de0814f5..0ed413113 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3296,7 +3296,7 @@ CONFIG_KVM_HYPERV=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set CONFIG_KVM=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 86fadbaa7..277611a32 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3275,7 +3275,7 @@ CONFIG_KVM_HYPERV=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set CONFIG_KVM=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index de6bea91b..678181aab 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2946,7 +2946,7 @@ CONFIG_KVM_HYPERV=y CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set CONFIG_KVM_XICS=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 1f2a6be97..1101b6255 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2926,7 +2926,7 @@ CONFIG_KVM_HYPERV=y CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set CONFIG_KVM_XICS=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 833a97cae..fdda163af 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2924,7 +2924,7 @@ CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_PROVE_MMU=y # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set # CONFIG_KXCJK1013 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a5a77baba..0bde976a6 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2904,7 +2904,7 @@ CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set # CONFIG_KXCJK1013 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 993797767..5c106cd08 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2913,7 +2913,7 @@ CONFIG_KVM_MAX_NR_VCPUS=4096 # CONFIG_KVM_PROVE_MMU is not set # CONFIG_KVM_S390_UCONTROL is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set # CONFIG_KXCJK1013 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index dbd5af854..74ecaae97 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3125,7 +3125,7 @@ CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set # CONFIG_KXCJK1013 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index bbdbaa800..eb307cc26 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3105,7 +3105,7 @@ CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set # CONFIG_KXCJK1013 is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 398c9881c..c83629818 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3165,7 +3165,7 @@ CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y CONFIG_KVM_PROVE_MMU=y CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set # CONFIG_KXCJK1013 is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 74da52a27..7d87aeccc 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3145,7 +3145,7 @@ CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_KVM_MMU_AUDIT=y # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_SMM=y -# CONFIG_KVM_SW_PROTECTED_VM is not set +CONFIG_KVM_SW_PROTECTED_VM=y # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set # CONFIG_KXCJK1013 is not set diff --git a/kernel.changelog b/kernel.changelog index 904067bfb..a97e3f558 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Wed Jan 24 2024 Fedora Kernel Team [6.8.0-0.rc1.615d30064886.13] +- CI: include aarch64 in CKI container image gating (Tales Aparecida) +- redhat: spec: Fix update_scripts run for CentOS builds (Neal Gompa) +- Linux v6.8.0-0.rc1.615d30064886 +Resolves: + * Tue Jan 23 2024 Fedora Kernel Team [6.8.0-0.rc1.7ed2632ec7d7.12] - New configs in drivers/crypto (Fedora Kernel Team) - net: bump CONFIG_MAX_SKB_FRAGS to 45 (Marcelo Ricardo Leitner) diff --git a/kernel.spec b/kernel.spec index e49bc60ab..fa2d1d395 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc1.20240123git7ed2632ec7d7.12 +%define pkgrelease 0.rc1.20240124git615d30064886.13 %define kversion 6 -%define tarfile_release 6.8-rc1-26-g7ed2632ec7d7 +%define tarfile_release 6.8-rc1-29-g615d30064886 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20240123git7ed2632ec7d7.12%{?buildid}%{?dist} +%define specrelease 0.rc1.20240124git615d30064886.13%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -1903,6 +1903,7 @@ update_target=%{primary_target} if [ "%{primary_target}" == "rhel" ]; then : # no-op to avoid empty if-fi error %if 0%{?centos} + update_scripts $update_target echo "Updating scripts/sources to centos version" update_target=centos %endif @@ -3767,6 +3768,11 @@ fi\ # # %changelog +* Wed Jan 24 2024 Fedora Kernel Team [6.8.0-0.rc1.615d30064886.13] +- CI: include aarch64 in CKI container image gating (Tales Aparecida) +- redhat: spec: Fix update_scripts run for CentOS builds (Neal Gompa) +- Linux v6.8.0-0.rc1.615d30064886 + * Tue Jan 23 2024 Fedora Kernel Team [6.8.0-0.rc1.7ed2632ec7d7.12] - New configs in drivers/crypto (Fedora Kernel Team) - net: bump CONFIG_MAX_SKB_FRAGS to 45 (Marcelo Ricardo Leitner) diff --git a/sources b/sources index 52ea60184..0a3419954 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.8-rc1-26-g7ed2632ec7d7.tar.xz) = c41a844a093592952b2e62dba6aa5459aef9051149997bb6d03250c3581ecd04e383fa72ff9e3f97c486e9e9574e1decf36e5cc4f26bb2e08427383c993218ad -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = eebf956e1d100378170ef887ad38516dd0b5e580cfaf8b6554a15e96e016c812c9f4b2321183be083bea2ef0fed1c7715828b7e7ba0868effb26f4e3c15850fa -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = f9b17f164fab6518afbe3db7c6ab3feeeea5af5aa27a0fe259d017cd0a0e1a600fbb445495d251bc5e90cadfaaebabd05f18ffdd7e66f8bd8f8b8ebc6bf1ac96 +SHA512 (linux-6.8-rc1-29-g615d30064886.tar.xz) = eab9bbeebaf82000e53e564f2fdc745e1831e071b3998478f043b2bd37659c3251e16e732836bf16d2b71d46b8a3adb035e3b8e5ce33d0ff7d6c8f341267a72b +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = dd8aed630808e7602001294d52c1ae2eb63a5a6aab63d20889afcf30202a83d90c8684dacc6e151dc093832444d9b90998b7eb2805b016687d443c797e3f3104 +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 05598cc6323673a054796a0f579a5094e8447076f4df9c9dcf9bd323bef58bc8c97c110edc023fff0e18d2747962d21ce7db35a10554ee881a468f33a91de649