summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-02-01 17:40:49 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-02-01 17:40:49 +0100
commitb85aec0014f9a3278948a1c9b1e1e69feb6ef9e7 (patch)
treeb5e0a44b0136f57745ec84efd99be222cb5ead81
parentecd92321f6f6915ebbffb2bad7ee26fe36f3cd40 (diff)
parent3fbb080931cb5dddc42d2b92d1bfdb810b76d01e (diff)
downloadkernel-b85aec0014f9a3278948a1c9b1e1e69feb6ef9e7.tar.gz
kernel-b85aec0014f9a3278948a1c9b1e1e69feb6ef9e7.tar.xz
kernel-b85aec0014f9a3278948a1c9b1e1e69feb6ef9e7.zip
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec3
-rw-r--r--patch-5.15-redhat.patch2
-rw-r--r--sources6
3 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index 158dac732..ca7f22889 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2977,6 +2977,9 @@ fi
#
#
%changelog
+* Sat Jan 29 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.18-0]
+- Linux v5.15.18 (Justin M. Forbes)
+
* Thu Jan 27 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.17-0]
- Revert "PCI/MSI: Mask MSI-X vectors only on success" (Justin M. Forbes)
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index bf15b1a31..cb1c74f85 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -74,7 +74,7 @@ index 8ff6dafafdf8..e3f786336cf9 100644
This is normally done in pci_enable_device(),
so this option is a temporary workaround
diff --git a/Makefile b/Makefile
-index 088197ed3f66..18279618693d 100644
+index 385286f987d8..7d1852b1edc6 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 960adb862..ff63a6167 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15.17.tar.xz) = 113ace76ff678efcf5ddf74faec7a0bdbf18a139f56cf01ad8ca7392727aa9a042da91bd1468ac0ab5e9cb53239b2a2a925f3e24cfa1499906b522d92c9a7468
-SHA512 (kernel-abi-stablelists-5.15.17-200.tar.bz2) = 88267475ed0858205be3be11e71942e25b6cfb3783f3d3f3ab85d213ebceb6ed03f8207f56e9a8714f2664ba51049798d76636ce8b26805ea64a5e22d3cdcb5e
-SHA512 (kernel-kabi-dw-5.15.17-200.tar.bz2) = 3d6b1a94c79d3ba13a33cb310522e80a5cf27309a457437092e1c5155dfc166b33e09ff1dce1475369b60890db50aec9896f1af9d9b87ff049ea33b5d87f045f
+SHA512 (linux-5.15.18.tar.xz) = df08181c6235faeb1cdec710165dc901b8c5729c51d5f668538ec5c06ac4b297161e83af733069177a3f76133fa15214ba3a4605cb43132c6bd1fe887b6c9be7
+SHA512 (kernel-abi-stablelists-5.15.18-200.tar.bz2) = 221b7f6481997c324e22b64034ca6c885889ca8710dc4d73baba369df95f7c056bf38392ed1d0e7e97f987212f3cbfef6a91614fcbdb3dc95d0473c5494a67b6
+SHA512 (kernel-kabi-dw-5.15.18-200.tar.bz2) = e65ba99a3657ad5976ca81a73f9e7c04a9145de36a693a0aa277a06a8ca0d41315a87f380ca5eeff15b2f3aaf17e969d06b9bda78f5287299d1c3559081fd869