diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-01 17:40:52 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-01 17:40:52 +0100 |
| commit | 754d951a1ead230583fb471e591d2e2d13b2f3b7 (patch) | |
| tree | b35469fcb3aa2ee73f6d61812c4d37f0cac6edb3 | |
| parent | 8ec2e4ceb1b07317e32826a977621ede621001d1 (diff) | |
| parent | ec69da7a42b5b7c3da91572ef22097b069ddbd01 (diff) | |
| download | kernel-754d951a1ead230583fb471e591d2e2d13b2f3b7.tar.gz kernel-754d951a1ead230583fb471e591d2e2d13b2f3b7.tar.xz kernel-754d951a1ead230583fb471e591d2e2d13b2f3b7.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 3 | ||||
| -rw-r--r-- | patch-5.15-redhat.patch | 2 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index ef431d616..5fe814faa 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)), \ @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.19-200.tar.bz2) = 7d28816c431019c9f09b7bcda4eb43ed2c3a7cbb8199af0fecccf16bff3ac992e2c9ed3acc2d06d7c8ebec3dc9ad76d0975cc179d2e4b7541af2af05f7e35de6 -SHA512 (linux-5.15.17.tar.xz) = 113ace76ff678efcf5ddf74faec7a0bdbf18a139f56cf01ad8ca7392727aa9a042da91bd1468ac0ab5e9cb53239b2a2a925f3e24cfa1499906b522d92c9a7468 -SHA512 (kernel-abi-stablelists-5.15.17-100.tar.bz2) = e8b409b5c8f9f574ee31e070ac3de35a660458262b46762578f81fc0f4023ceaba5e37894a4ba656eb00909dc28086cd10f10069f619d1fcd29b7725d4b73558 -SHA512 (kernel-kabi-dw-5.15.17-100.tar.bz2) = 3d6b1a94c79d3ba13a33cb310522e80a5cf27309a457437092e1c5155dfc166b33e09ff1dce1475369b60890db50aec9896f1af9d9b87ff049ea33b5d87f045f +SHA512 (linux-5.15.18.tar.xz) = df08181c6235faeb1cdec710165dc901b8c5729c51d5f668538ec5c06ac4b297161e83af733069177a3f76133fa15214ba3a4605cb43132c6bd1fe887b6c9be7 +SHA512 (kernel-abi-stablelists-5.15.18-100.tar.bz2) = 8616aa623411ae2cd5b911d7e0cd22971f5eb4540d2bc80f01714f19c87095aabe668cd011eb41c696318b8a05e534028dce6b9a4f1a57f8d66952fa205e1075 +SHA512 (kernel-kabi-dw-5.15.18-100.tar.bz2) = e65ba99a3657ad5976ca81a73f9e7c04a9145de36a693a0aa277a06a8ca0d41315a87f380ca5eeff15b2f3aaf17e969d06b9bda78f5287299d1c3559081fd869 |