diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-07 14:32:23 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-07 14:32:23 +0100 |
| commit | a5d1d438da3b2f4eaebb3d6318935270d388893f (patch) | |
| tree | f64159c585ef43f9809b5d2e767259d99f628983 | |
| parent | 733bf3876b05bf6f1ea792f0eb7970d1b291984b (diff) | |
| parent | 02f4c24d93f39aec58363b8a0052f7459c96efa5 (diff) | |
| download | kernel-a5d1d438da3b2f4eaebb3d6318935270d388893f.tar.gz kernel-a5d1d438da3b2f4eaebb3d6318935270d388893f.tar.xz kernel-a5d1d438da3b2f4eaebb3d6318935270d388893f.zip | |
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 3 | ||||
| -rw-r--r-- | patch-5.15-redhat.patch | 8 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 1d640bae6..126d381ac 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2977,6 +2977,9 @@ fi # # %changelog +* Wed Jan 05 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.13-0] +- Linux v5.15.13 + * Wed Dec 29 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.12-0] - iwlwifi: mvm: Increase the scan timeout guard to 30 seconds (Ilan Peer) diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 187881358..f50f3054b 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -51,10 +51,10 @@ 50 files changed, 753 insertions(+), 202 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index a454f438bd62..d00009504c94 100644 +index 8ff6dafafdf8..e3f786336cf9 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3953,6 +3953,15 @@ +@@ -3955,6 +3955,15 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. @@ -71,7 +71,7 @@ index a454f438bd62..d00009504c94 100644 This is normally done in pci_enable_device(), so this option is a temporary workaround diff --git a/Makefile b/Makefile -index 474b2a2292ca..22cae212633b 100644 +index 0964b940b889..717685ccae64 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1684,7 +1684,7 @@ index 00070a8a6507..e9e0ffa990cd 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/include/linux/efi.h b/include/linux/efi.h -index 6b5d36babfcc..fd4a5d66a9d0 100644 +index 3d8ddc5eca8c..779f41901f35 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ @@ -1,3 +1,3 @@ -SHA512 (linux-5.15.12.tar.xz) = c227f0d22128fac855f97d5bc8a48bfe7d7756a1176eb595372b5a073f2077a242514da41667ec4fb7f3b96b32e324611fabba6f3acad8646e8349462ce76363 -SHA512 (kernel-abi-stablelists-5.15.12-200.tar.bz2) = 0d6bb650ac22ec56622c17c65ed6ecce30309e47f8ab482b4348767e9939236838203ed4fb1d0db1013473ba89969adcf07f9a42cbff1150e14340ff9dca5e1f -SHA512 (kernel-kabi-dw-5.15.12-200.tar.bz2) = e370b48397aadcfcb93304dad8494a832c78aa2b35dbe72f8ddf91cae3430001b767fb8e5f0d176c6ab40766a97afcaee89a0a9400a970aa92592b0b692b7a8e +SHA512 (linux-5.15.13.tar.xz) = ed8a1212a7f0363657df4b60df8f2e1520e82777d45cf5f3fd6ce25940f6b260d2fc71e0e2a09c0f0bf99e6e8ae2b7ef59cf92562d812422bb62c774a1118e87 +SHA512 (kernel-abi-stablelists-5.15.13-200.tar.bz2) = 282bbdd21ca12b54f0b25d7d04d2efab6038aa19bc29f8ff791cad184d4065502bbb638279e51beb6a309229f62a4712b2364c2d8f08ffd469b6120a2e3608d5 +SHA512 (kernel-kabi-dw-5.15.13-200.tar.bz2) = d6c2621d32e96de79a1122a16ae4c8d39ac06f543a83be6c537453ef6959fda884f026edf40a43ae027479cb824712cd14df0c4eedf9ae898b0fdb4b1f1d311e |