diff --git a/Makefile.rhelver b/Makefile.rhelver index f5b0b5535..679d82097 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 = 60 +RHEL_RELEASE = 63 # # RHEL_REBASE_NUM diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 029e1f7ea..acb73803f 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2370,7 +2370,7 @@ CONFIG_I2C_TINY_USB=m CONFIG_I40E_DCB=y CONFIG_I40E=m CONFIG_I40EVF=m -CONFIG_I6300ESB_WDT=m +# CONFIG_I6300ESB_WDT is not set # CONFIG_I8K is not set # CONFIG_IA32_EMULATION_DEFAULT_DISABLED is not set # CONFIG_IAQCORE is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 1d3eed5f9..1de2401cc 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2354,7 +2354,7 @@ CONFIG_I2C_TINY_USB=m CONFIG_I40E_DCB=y CONFIG_I40E=m CONFIG_I40EVF=m -CONFIG_I6300ESB_WDT=m +# CONFIG_I6300ESB_WDT is not set # CONFIG_I8K is not set # CONFIG_IA32_EMULATION_DEFAULT_DISABLED is not set # CONFIG_IAQCORE is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 14b033833..8861c2e5e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2360,7 +2360,7 @@ CONFIG_I2C_TINY_USB=m CONFIG_I40E_DCB=y CONFIG_I40E=m CONFIG_I40EVF=m -CONFIG_I6300ESB_WDT=m +# CONFIG_I6300ESB_WDT is not set # CONFIG_I8K is not set # CONFIG_IA32_EMULATION_DEFAULT_DISABLED is not set # CONFIG_IAQCORE is not set diff --git a/kernel.changelog b/kernel.changelog index be60f01b8..a7772b247 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,16 @@ +* Sun Sep 15 2024 Fedora Kernel Team [6.11.0-63] +- Linux v6.11.0 +Resolves: + +* Sun Sep 15 2024 Fedora Kernel Team [6.11.0-0.rc7.d42f7708e27c.62] +- Linux v6.11.0-0.rc7.d42f7708e27c +Resolves: + +* Sat Sep 14 2024 Fedora Kernel Team [6.11.0-0.rc7.b7718454f937.61] +- Consolidate configs into common for 6.11 kernels (Justin M. Forbes) +- Linux v6.11.0-0.rc7.b7718454f937 +Resolves: + * Fri Sep 13 2024 Fedora Kernel Team [6.11.0-0.rc7.196145c606d0.60] - uki-virt: add systemd-cryptsetup module (Vitaly Kuznetsov) - redhat/docs: fix command to install missing build dependencies (Davide Cavalca) diff --git a/kernel.spec b/kernel.spec index 451ba282e..efc8aa7b4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc7.20240913git196145c606d0.60 +%define pkgrelease 63 %define kversion 6 -%define tarfile_release 6.11-rc7-97-g196145c606d0 +%define tarfile_release 6.11 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20240913git196145c606d0.60%{?buildid}%{?dist} +%define specrelease 63%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4137,6 +4137,16 @@ fi\ # # %changelog +* Sun Sep 15 2024 Fedora Kernel Team [6.11.0-63] +- Linux v6.11.0 + +* Sun Sep 15 2024 Fedora Kernel Team [6.11.0-0.rc7.d42f7708e27c.62] +- Linux v6.11.0-0.rc7.d42f7708e27c + +* Sat Sep 14 2024 Fedora Kernel Team [6.11.0-0.rc7.b7718454f937.61] +- Consolidate configs into common for 6.11 kernels (Justin M. Forbes) +- Linux v6.11.0-0.rc7.b7718454f937 + * Fri Sep 13 2024 Fedora Kernel Team [6.11.0-0.rc7.196145c606d0.60] - uki-virt: add systemd-cryptsetup module (Vitaly Kuznetsov) - redhat/docs: fix command to install missing build dependencies (Davide Cavalca) diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 66946a849..d5f6a167b 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -193,7 +193,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 2966d5fbbf17..433b17f4a986 100644 +index 34bd1d5f9672..73b3389da4d0 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 12bd5fc30..66a2253c7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc7-97-g196145c606d0.tar.xz) = b059aa0c94429663dec4af34aa82ffd4c5de61f93569cda7fb3194a9b862d6182c33bd91ab10f7d421b10363c02d375dc4dec7d5d42e7be70072c1333714ee8f -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = c21ac3648230e9fb45f05a76bbc9bd9d3416da65422fadec6c0763f2fd145767d7ab2a3489bd01034ee8432d9798c8931a2bb344dd99d98209944d52b1c47934 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 92b21b046f214c5536c5c350dd9f93b6e2e9ab28c1c6e47b55e2cb5c7a34b6a2bd03d8d13300276a86c75813538c26b823781b23b2e24da89459bc10668d5d2b +SHA512 (linux-6.11.tar.xz) = bb8a228ff8fba36e3e2c2f24dbe2b5926af0daa8a472872fbc9ac4e81599bab46b399cf4a34022db3aa47a5476ab81bf9ecae1725bf11e7f0b01b0e2c91bc0ee +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 3aa0be89a71ee2f41b38fe56830bf63fab0b82ae0ab9fb296355ec04dbc9d8e8d5ab5847d34854fcf7ea5c21c120fe98c33729cd4ae1ccb25bfdd9f3fc340d6f +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b9a43771e958d7b7460667bd0e2b300d43f2bc95d776ca1a6ce18214addcdf4aba24526421ac6b8ab031f5cf56ca0d152203beb1c42f786782cfcef7d39a6616