diff --git a/Makefile.rhelver b/Makefile.rhelver index 2d435bed7..1a1e2ffbd 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 = 35 +RHEL_RELEASE = 37 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 1a354ba74..5bbfe37e4 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3741,7 +3741,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 121c177c3..ba3c4f1c0 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3720,7 +3720,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 1403f7127..fdcbeb294 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3737,7 +3737,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 14c93b885..cacf77cf0 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3716,7 +3716,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index f97b83776..825056fb3 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3782,7 +3782,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 93d9f5024..13bfd0b7d 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3761,7 +3761,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index b24cd2e2e..0b99be9fb 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3418,7 +3418,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 2a78b6c8b..752002951 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3398,7 +3398,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index cee76c2c9..a01b6deac 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3400,7 +3400,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ac49b4ee9..77bfdffd8 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3380,7 +3380,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 8d9a7513a..71b679826 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3390,7 +3390,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 12b8f9cc5..fa2b05d29 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3602,7 +3602,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index cbccf436c..6e458ca8d 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3582,7 +3582,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 6f9063386..e25d96a8e 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3647,7 +3647,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 13877fef8..e5d6a0e19 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3627,7 +3627,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m -# CONFIG_MLX5_DPLL is not set +CONFIG_MLX5_DPLL=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_MACSEC=y diff --git a/kernel.spec b/kernel.spec index 59d40dbc9..418f82b48 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.rc4.35 +%define pkgrelease 0.rc4.20231206gitbee0e7762ad2.37 %define kversion 6 -%define tarfile_release 6.7-rc4 +%define tarfile_release 6.7-rc4-9-gbee0e7762ad2 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.35%{?buildid}%{?dist} +%define specrelease 0.rc4.20231206gitbee0e7762ad2.37%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3754,6 +3754,13 @@ fi\ # # %changelog +* Wed Dec 06 2023 Fedora Kernel Team [6.7.0-0.rc4.bee0e7762ad2.37] +- Turn off shellcheck for the fedora-stable-release script (Justin M. Forbes) + +* Tue Dec 05 2023 Fedora Kernel Team [6.7.0-0.rc4.bee0e7762ad2.36] +- Add some initial Fedora stable branch script to redhat/scripts/fedora/ (Justin M. Forbes) +- Linux v6.7.0-0.rc4.bee0e7762ad2 + * Mon Dec 04 2023 Fedora Kernel Team [6.7.0-0.rc4.35] - Linux v6.7.0-0.rc4 diff --git a/sources b/sources index 51092b455..b9057f360 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-rc4.tar.xz) = a2c9143c3b4cb6e354b814efb54e30959eb6d03df283408b81d21a06b862b9c5b68f1a397904c166148497b440705c8c8fda991eb1da40c9d01a584c65b5821d -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 8f755be6817ab2e216010471e85b4c08489b9682a2e07bb779e23391aa621fb94bcf6960659deb466458e28a1f566fcc9bd707bf5a58a0912f9d8f093de3dd9b -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = ab09941902e0de4ccf8fdca403c48bc0adc6ce8e0226373ff83e779cc9ee10d50ea29517e5f8ffb22764f43d9117e3d92a84d2932d4242adaa75a35d2425f8f6 +SHA512 (linux-6.7-rc4-9-gbee0e7762ad2.tar.xz) = 98dcb797a9d0d63adec8c9257f8f96cd0d670236a481ede231e38dd84ae995a235922ba1edc8ba0e39b7ab4732939a6c924e763d7242f7a8ca72a7f09104b440 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = bfe0e3bcf1786298d7c29f69a5ae45a1754cd868244fb78f180b09545e32dbdb93689622b135cf17a47d223ef9cd9009a1cfa67e264ca88d6210cea5fbba9323 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 7e9e4d2b5871e24a62208f33843bdd2f087c1c991ba00efca3af8d6851ac2235102191486bd0ccfd0853abc60ebd2586a6dd54996c6adf66e62f262427cb3a7b