diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-29 09:32:17 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-29 09:32:17 +0200 |
| commit | a94a95bd821948962c0153614abdfac791d3ee77 (patch) | |
| tree | 427a8a53ed5d863b493a7c9fceaf75c153e15d54 | |
| parent | acbf8db990a418ca47036e392f0573692e194dde (diff) | |
| parent | a4db744327b2a4d06e4adf8267b9b93d0f75ccd3 (diff) | |
| download | kernel-a94a95bd821948962c0153614abdfac791d3ee77.tar.gz kernel-a94a95bd821948962c0153614abdfac791d3ee77.tar.xz kernel-a94a95bd821948962c0153614abdfac791d3ee77.zip | |
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 3 | ||||
| -rw-r--r-- | patch-5.18-redhat.patch | 2 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index e55935c8d..c131c919f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -3041,6 +3041,9 @@ fi # # %changelog + +* Sat Jun 25 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.7-100] +- v5.18.7 rebase * Wed Jun 22 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.6-0] - drm/i915: Temporarily disable selective fetch for PSR2 on ADL-P (Mark Pearson) [2065794] - Turn E1000 back on correctly (Justin M. Forbes) diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 16a0cc39a..0008a891f 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -45,7 +45,7 @@ 44 files changed, 721 insertions(+), 191 deletions(-) diff --git a/Makefile b/Makefile -index 27850d452d65..c6cd7b49725d 100644 +index 61d63068553c..cd3197d5397e 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-5.18.6.tar.xz) = f2cafbc5c0a39074d68b5b8ee294ea7ff44d6b65a624f5bc1acc31d35b9268e9f7048518ab24e75196392938afee146174aa179e83e6627a9bec262fcb51343c -SHA512 (kernel-abi-stablelists-5.18.6-100.tar.bz2) = 756ee10391ddb0df999997182dae5e046a938e91a1657ca02ba49ae766949b7f6d281e5a4b19cdf07bb756b84f64aa51e22a7418d2e0b3b2b0cdc2596be0d18f -SHA512 (kernel-kabi-dw-5.18.6-100.tar.bz2) = a5fe2b56d19694be8dc3615e5e07edda7d6f7a9bc8f5fa878edb5b80b149eac12619190676275d290e3a4a4e50ee8f31fecf94e30b4845b56a4b03b9edb0d2c3 +SHA512 (linux-5.18.7.tar.xz) = a943d7842e757b1386ff9ef0c319bbea74bd9ff7a43db7e1be2dea8d8ca0bb16d0bfb3d7f735652a2351095d4a47dc7a42b9459b133d00dc0d73dbf26fc0911d +SHA512 (kernel-abi-stablelists-5.18.7-100.tar.bz2) = a651e5092f8142057458ae0c2b890a7e312f155cdc57b2f5d84238299cb634e30a69e26d42d8075e03fb0b817ba1495f92b1a1f4e5e5157bcaa1f367530f997f +SHA512 (kernel-kabi-dw-5.18.7-100.tar.bz2) = 70fd6a26797716eb6a4d80c7bd2529663d9f271b67f79be61d9d27ff85a0af55e9fd1bad443894307910d78b627c840cda68abc0c051bd0f8834954bd5db1102 |