diff --git a/Makefile.rhelver b/Makefile.rhelver index c9670fb00..47598f6b1 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 = 23 +RHEL_RELEASE = 24 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d1efedce5..364421f80 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3039,6 +3039,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_ICE_HWTS=y CONFIG_ICE=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 61123c631..43cdb68c7 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3022,6 +3022,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_ICE_HWTS=y CONFIG_ICE=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index d35392d61..265fa9aae 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2994,6 +2994,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_ICE_HWTS=y CONFIG_ICE=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 0a9dc0d1a..263b10bab 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2978,6 +2978,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_ICE_HWTS=y CONFIG_ICE=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 677aa2312..26b3e4972 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2939,6 +2939,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_ICE_HWTS=y CONFIG_ICE=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index d12779adb..4d906119b 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2923,6 +2923,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_ICE_HWTS=y CONFIG_ICE=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 76d8e4f3e..0eb4870a0 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2436,6 +2436,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_IBM_BSR=m CONFIG_IBMVETH=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f17ae057f..fb3ee72e5 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2416,6 +2416,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_IBM_BSR=m CONFIG_IBMVETH=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0e5e4eb75..d34cc8dc7 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2418,6 +2418,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_IBM_PARTITION=y CONFIG_ICE_HWTS=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 76b83e772..b4e1fc110 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2398,6 +2398,7 @@ CONFIG_I2C=y CONFIG_I40E=m CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set +# CONFIG_I8K is not set # CONFIG_IAQCORE is not set CONFIG_IBM_PARTITION=y CONFIG_ICE_HWTS=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 1d88d184f..a40a501ae 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2636,7 +2636,7 @@ CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m -CONFIG_I8K=y +# CONFIG_I8K is not set CONFIG_IA32_EMULATION=y # CONFIG_IAQCORE is not set CONFIG_IB700_WDT=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 4e6d9daf2..715a80686 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2318,7 +2318,7 @@ CONFIG_I40E_DCB=y CONFIG_I40E=m CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set -CONFIG_I8K=y +# CONFIG_I8K is not set CONFIG_IA32_EMULATION=y # CONFIG_IAQCORE is not set CONFIG_IAVF=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 24e52dd5f..42175fa26 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2616,7 +2616,7 @@ CONFIG_I40E=m CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m -CONFIG_I8K=y +# CONFIG_I8K is not set CONFIG_IA32_EMULATION=y # CONFIG_IAQCORE is not set CONFIG_IB700_WDT=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 408954b4e..972a66cee 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2302,7 +2302,7 @@ CONFIG_I40E_DCB=y CONFIG_I40E=m CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set -CONFIG_I8K=y +# CONFIG_I8K is not set CONFIG_IA32_EMULATION=y # CONFIG_IAQCORE is not set CONFIG_IAVF=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index a0683f870..6ae7c26f0 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -2409,7 +2409,7 @@ CONFIG_I40E_DCB=y CONFIG_I40E=m CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set -CONFIG_I8K=y +# CONFIG_I8K is not set CONFIG_IA32_EMULATION=y # CONFIG_IAQCORE is not set CONFIG_IAVF=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 76771c4e1..606313c96 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -2393,7 +2393,7 @@ CONFIG_I40E_DCB=y CONFIG_I40E=m CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set -CONFIG_I8K=y +# CONFIG_I8K is not set CONFIG_IA32_EMULATION=y # CONFIG_IAQCORE is not set CONFIG_IAVF=m diff --git a/kernel.spec b/kernel.spec index 0bc39f936..af988769e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -174,13 +174,13 @@ Summary: The Linux kernel %define specrpmversion 6.5.0 %define specversion 6.5.0 %define patchversion 6.5 -%define pkgrelease 0.rc3.23 +%define pkgrelease 0.rc3.20230725git0b5547c51827.24 %define kversion 6 -%define tarfile_release 6.5-rc3 +%define tarfile_release 6.5-rc3-18-g0b5547c51827 # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.23%{?buildid}%{?dist} +%define specrelease 0.rc3.20230725git0b5547c51827.24%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -3308,7 +3308,9 @@ rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ if [[ ! -e "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext" ]]; then\ ln -s "/lib/modules/%{KVERREL}%{?1:+%{1}}/symvers.%compext" "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext"\ - command -v restorecon &>/dev/null && restorecon "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext" \ + if command -v restorecon &>/dev/null; then\ + restorecon "/boot/symvers-%{KVERREL}%{?1:+%{1}}.%compext"\ + fi\ fi\ %{nil} @@ -3738,6 +3740,12 @@ fi\ # # %changelog +* Tue Jul 25 2023 Fedora Kernel Team [6.5.0-0.rc3.0b5547c51827.24.el127] +- redhat/scripts/rh-dist-git.sh: fix outdated message and comment (Denys Vlasenko) +- redhat/configs: Disable CONFIG_I8K (Prarit Bhargava) +- Make sure posttrans script doesn't fail if restorecon is not installed (Daan De Meyer) +- Linux v6.5.0-0.rc3.0b5547c51827 + * Mon Jul 24 2023 Fedora Kernel Team [6.5.0-0.rc3.23.el127] - Linux v6.5.0-0.rc3 diff --git a/patch-6.5-redhat.patch b/patch-6.5-redhat.patch index 6ec0ed1ec..4ec7ba232 100644 --- a/patch-6.5-redhat.patch +++ b/patch-6.5-redhat.patch @@ -232,7 +232,7 @@ index 00d76448319d..e679d13303e3 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 52683fddafaf..d0f15368dcce 100644 +index 0ba1067f4e5f..c75367c1671f 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1561,6 +1561,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) diff --git a/sources b/sources index 44601a6fb..b7d2560c6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-rc3.tar.xz) = 2a086302006f41e39eda9f5b8031c582fab4cb89ae0204ed42551f5b40874a46c3b92769d576485397f18d6e15c77dea29bcb1b68984302838d49172687918fa -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = e34757ba52d360824e44db571a1f984a5daf442a3206e81daa2b9a5010120f7eb12bf8c1d53e302069c7c8a70ad4081c59f7ecb83719a80f01f9249ab9ffdf6e -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 978cc888e098dea4aafa2fa10e30ce941bcb07b26d1b54cdf7524968effa6fc676bd94b4bffba67943166318f02df0bc3109293cf3d13eb5727079cc0da602a6 +SHA512 (linux-6.5-rc3-18-g0b5547c51827.tar.xz) = 2ef197fe7cfdd98269770fd1e4d2e5c06ddd5b27a046f1fb1b2a33c16a1c141a436901235d1b9b67c188ead411ffe9c93d7e5a56f907a902cb60e9b1eb5418a1 +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = f65e019c152023bc49c7eec16e01e5233e4774b1d6765ae4455c4d3810432c86c531524473d5a8410b2cfe682092958822612113a831f0382beea6d814554a54 +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 2a93db19f2fbfcd5228dc9020d0c7f135ba437166fa4d561e833fd6c58a564f8c098d1b64687e954172f35c2e09c73be7deb2a5b8214718882d384ee38aaf8d5