diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-02 16:31:22 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-02 16:31:22 +0200 |
| commit | c0719b7950a1689d8e8a96e72516956604e4b6a7 (patch) | |
| tree | 3bf879beb20e573030969077aca1dde56d120ed0 | |
| parent | cbc73e928e4ef31780c570d98e877d49a9d8fc67 (diff) | |
| parent | 4db08efadd9664ad0c10303f3a35ca535e675727 (diff) | |
| download | kernel-c0719b7950a1689d8e8a96e72516956604e4b6a7.tar.gz kernel-c0719b7950a1689d8e8a96e72516956604e4b6a7.tar.xz kernel-c0719b7950a1689d8e8a96e72516956604e4b6a7.zip | |
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 4 | ||||
| -rw-r--r-- | patch-5.18-redhat.patch | 4 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 7d5f4c4f7..c5b202700 100755 --- a/kernel.spec +++ b/kernel.spec @@ -3041,9 +3041,9 @@ fi # # %changelog +* Wed Jun 29 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.8-0] +- Remove RHJOBS define from fedora-stable-release.sh (Justin M. Forbes) -* Sat Jun 25 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.7-200] -- 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 0008a891f..baf737bec 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 61d63068553c..cd3197d5397e 100644 +index 6ac3335f65af..5df170f9243f 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1328,7 +1328,7 @@ index 857d4c2fd1a2..9353941f3a97 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 1ea85c88d795..d30563dabd95 100644 +index a2862a56fadc..1cddbc757925 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1,3 +1,3 @@ -SHA512 (linux-5.18.7.tar.xz) = a943d7842e757b1386ff9ef0c319bbea74bd9ff7a43db7e1be2dea8d8ca0bb16d0bfb3d7f735652a2351095d4a47dc7a42b9459b133d00dc0d73dbf26fc0911d -SHA512 (kernel-abi-stablelists-5.18.7-200.tar.bz2) = 9c30296ec4d0909bbc3c24aa19515876f3a11a82cb07af415ee1a0c1f951c8f0011621e4dc9b91d5a7caf7a63fd41790548977373d490c42d794421237ab69c2 -SHA512 (kernel-kabi-dw-5.18.7-200.tar.bz2) = 70fd6a26797716eb6a4d80c7bd2529663d9f271b67f79be61d9d27ff85a0af55e9fd1bad443894307910d78b627c840cda68abc0c051bd0f8834954bd5db1102 +SHA512 (linux-5.18.8.tar.xz) = 2aa8c9073cc9f28a9e8242fef263335a2a203b3452de0c6da51b75336f6b1c5304256f90b9c1839b67042d5ded52773607079a7844edad582d040b35ef1b999d +SHA512 (kernel-abi-stablelists-5.18.8-200.tar.bz2) = b2333ce40dec9efbcaa289c171be2c2fe36ad77a2e410d520ce7cbaa5e1f7ea406b0bd79b5288e31e31d2a93a253929ff3766f3a282426c6b5cc748a8a7a8e9b +SHA512 (kernel-kabi-dw-5.18.8-200.tar.bz2) = 836b6a3c3644df89a1b2030a18fa31afaa27a129ae1744e1c4ded64b8abc10e4708246a2262c6308a71bfb4221743b3769ec41fd38d9bbe9e056ecf7032a4104 |