From e19bdd19a6c1775239909c1e0469c1d463393a6f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 10 Nov 2023 09:41:56 -0600 Subject: [PATCH] kernel-6.7.0-0.rc0.20231110git89cdf9d55601.13 * Fri Nov 10 2023 Fedora Kernel Team [6.7.0-0.rc0.89cdf9d55601.13] - Linux v6.7.0-0.rc0.89cdf9d55601 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.spec | 9 ++++++--- patch-6.7-redhat.patch | 8 ++++---- sources | 6 +++--- 4 files changed, 14 insertions(+), 11 deletions(-) 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.spec b/kernel.spec index 2890523c5..8fb637f1e 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.rc0.20231109git6bc986ab839c.12 +%define pkgrelease 0.rc0.20231110git89cdf9d55601.13 %define kversion 6 -%define tarfile_release 6.6-15494-g6bc986ab839c +%define tarfile_release 6.6-15859-g89cdf9d55601 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20231109git6bc986ab839c.12%{?buildid}%{?dist} +%define specrelease 0.rc0.20231110git89cdf9d55601.13%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3709,6 +3709,9 @@ fi\ # # %changelog +* Fri Nov 10 2023 Fedora Kernel Team [6.7.0-0.rc0.89cdf9d55601.13] +- Linux v6.7.0-0.rc0.89cdf9d55601 + * Thu Nov 09 2023 Fedora Kernel Team [6.7.0-0.rc0.6bc986ab839c.12] - Linux v6.7.0-0.rc0.6bc986ab839c diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index fb09784f2..90f7d2654 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -72,10 +72,10 @@ 71 files changed, 2060 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 7b4d7aeab601..b1d6d25609d2 100644 +index 65731b060e3f..687785c93225 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6801,6 +6801,15 @@ +@@ -6802,6 +6802,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -1554,7 +1554,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index c146378c7d03..f9e8d35eaccc 100644 +index f17a1113f3d6..23b73a1fd609 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1565,7 +1565,7 @@ index c146378c7d03..f9e8d35eaccc 100644 #include #include #include -@@ -2931,6 +2932,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -3014,6 +3015,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); diff --git a/sources b/sources index 33fbd98b9..ee9c773f8 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.6-15494-g6bc986ab839c.tar.xz) = 01cac6fd05c4afa7c9f3bb22864d902293f688383c0675876338d773a71e5f24a4f8d3cd59b359c94f7c90348b9cc6bfb5ea7aba605550ebb3172cc519611ccc -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = fd66a50f66b9e9c440836223c0d7b3c4456baea02bd56398630dc8733aa68442896c45bf501e0a74d480f69dd6ff55c0fbcc309f299d852a977e266320e5a8d1 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = acf1fbc7bb6aeff7a09db52563a59915862430eacc3ffdc26e2014c3fbd187d2e820d64baef0a0f83dc134c6757612c7bbeadeb2ebc619ca62344a69b9370a95 +SHA512 (linux-6.6-15859-g89cdf9d55601.tar.xz) = da35da48871c0c0daf8c057ea6d45dc51f6b10f345bd5c33ac32ba5f90e712a4126b10c71519b29feec52435e2d6cfae1bc287464aa56dbb0b5a5029cc6a1ea7 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = d6d565ccc6eb03067b9a25abd39f8dbddba8de04c8fead551bef684bacd550f978c6ba5f9923795388d8dc58b7edeb05a7b4f48b1bcc7c246f26b1af26d47fae +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 9561c16ed1b3ee89c21d6700acb971bf88d0122e0c8ea5f8fb77814c4e8ab7a3ea9e47b556cd89d37517f62fb3523eef947fa828887e5c222a624a33e32cc2ad