diff --git a/Makefile.rhelver b/Makefile.rhelver index 045195d74..931d6835d 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 = 53 +RHEL_RELEASE = 54 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index d848c4219..6e2294d6f 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -7507,7 +7507,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index cebfef9f4..fa21973dd 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -7482,7 +7482,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 7ea02b451..6fb4fcf38 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -7070,7 +7070,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 3c4543fcc..60d853efe 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -7047,7 +7047,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 691b84115..dea2b1966 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -7059,7 +7059,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 78099db7f..cca26dcb7 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -7036,7 +7036,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a555460a4..b615c3f99 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -7063,7 +7063,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 6d4473201..a8f8527e0 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -7386,7 +7386,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 71b4c2c35..e6e5ba815 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -7362,7 +7362,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set -CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_SUPPORT_ASCII_CI is not set CONFIG_XFS_SUPPORT_V4=y # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set diff --git a/kernel.spec b/kernel.spec index b76339377..2550df65e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -148,13 +148,13 @@ Summary: The Linux kernel %define specrpmversion 6.4.0 %define specversion 6.4.0 %define patchversion 6.4 -%define pkgrelease 0.rc7.53 +%define pkgrelease 0.rc7.20230620git692b7dc87ca6.54 %define kversion 6 -%define tarfile_release 6.4-rc7 +%define tarfile_release 6.4-rc7-14-g692b7dc87ca6 # This is needed to do merge window version magic %define patchlevel 4 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.53%{?buildid}%{?dist} +%define specrelease 0.rc7.20230620git692b7dc87ca6.54%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.4.0 @@ -3439,6 +3439,9 @@ fi # # %changelog +* Tue Jun 20 2023 Fedora Kernel Team [6.4.0-0.rc7.692b7dc87ca6.54] +- Linux v6.4.0-0.rc7.692b7dc87ca6 + * Mon Jun 19 2023 Fedora Kernel Team [6.4.0-0.rc7.53] - common: remove deleted USB PCCARD drivers (Peter Robinson) - fedora: further cleanup of pccard/cardbus subsystem (Peter Robinson) diff --git a/sources b/sources index 93ce33c30..28cf3788c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.4-rc7.tar.xz) = 81427789b27964cd96ce2fe58f66aa9ef684e4190c3c72c8f18cca516e97dd63153e0eaadf41a3eb48d5676be704c1f87d8f5045d5b3e44bcca38d265054671e -SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 5926d53b9a7ca697965c51b6ecc7f32201696ed81393d32bb26655d2763c8b3477c12e77eea5484be130da681fb6596b8a65f1f72962434c85f0f6735c4ed214 -SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 38351d1df0807152d8aed2057673293bdb55a9b06919271af4f8a9f569722b94dd94d0317abf45e3dc0cb65e38dc668f34c28c9fa3861877653c851e1406e491 +SHA512 (linux-6.4-rc7-14-g692b7dc87ca6.tar.xz) = e3f73e343b4a12dc72fc01c9244e2f439e9b0acc752211dc6286cdfe611c061a3b8663451ae9330ad1cf84934fe5d80a5746d6a451a97e2f6e006371b43d927c +SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 709c120ca41ef0da67f1ddf1a068a5df32fbfd45570fc8522f2791175149df8829e7f4c87630cb4cca3561ab2636d59c6c21ff808fc77e4912c9edb209df90d1 +SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = df502609ff015de66e58b0c617177be837a024e28e046f8b16f0743187adff205c209175a82043a3a1cd020d8f9cd54433ee7aa16b65eb7e1599417fa587654a