diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-09 10:56:04 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-09 10:56:04 +0200 |
| commit | a8475125460087ee507d358e70438e268dcd64ad (patch) | |
| tree | 0b29c7f0df4bb1a3a6b75dc5fdfbd31e825c5888 | |
| parent | 601f3463cc7aacc82af0970d576378b518fab3fe (diff) | |
| parent | 049ca45100c102296bbc38c7e948a608ed11263e (diff) | |
| download | kernel-a8475125460087ee507d358e70438e268dcd64ad.tar.gz kernel-a8475125460087ee507d358e70438e268dcd64ad.tar.xz kernel-a8475125460087ee507d358e70438e268dcd64ad.zip | |
Merge commit '049ca45100c102296bbc38c7e948a608ed11263e' into stabilization-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 4 | ||||
| -rw-r--r-- | patch-5.18-redhat.patch | 2 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 341fdaf11..556bdce33 100755 --- a/kernel.spec +++ b/kernel.spec @@ -3041,6 +3041,10 @@ fi # # %changelog +* Mon Jun 06 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.2-0] +- Add the fedora-stable-release.sh script to generate stable dist-git (Justin M. Forbes) +- Add the simpleDRM revert patch so that F35 can be maintained without it (Justin M. Forbes) + * Thu May 26 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.0-0] - Fix versioning for Stable Fedora (Justin M. Forbes) - Reset release to 0 for stable (Justin M. Forbes) diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 796930435..12101f9fc 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -44,7 +44,7 @@ 43 files changed, 712 insertions(+), 191 deletions(-) diff --git a/Makefile b/Makefile -index 2bb168acb8f4..d4a8ca96e4a2 100644 +index 6b1d606a92f6..548f077c486c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294 -SHA512 (linux-5.18.1.tar.xz) = bf0b8f7525f0ccc20b359736e694e953e0c28881fb886cdfdec1c800e8cae8ac8d495a66e104f8dd86054688c31874b0e17a0e5e7141e8f00cd2e338b51a3986 -SHA512 (kernel-abi-stablelists-5.18.1-200.tar.bz2) = 2733a09b9032a311bfa80e412691978c9b75112de35fba1b1c9001b01a3031019cec4c232d95ddcce4b59fc1f9aefd11c79c7030244e964e05b936ad75555a80 -SHA512 (kernel-kabi-dw-5.18.1-200.tar.bz2) = 92d19a7604057d7c6997250dd0313b8a8d0b1d664dc99d022e4e8230d84cd1157ef954ff3cea4e9c3f98c2ab54126b48b12d6a92c36d6188223366ef431b55f0 +SHA512 (linux-5.18.2.tar.xz) = 7e1e4f563ccc9846604de3ca978dfb1a504aef58ddc36113a39eba6ed9bc20f1bd31fa95b26801fd797ee925f9f2b7db1e29753af612b60cad76d699251ac22d +SHA512 (kernel-abi-stablelists-5.18.2-200.tar.bz2) = 42374f46bffb10d3de0c00c2d697240f7dae9b743595e33e89768cdff9ab0771deda28706ce2e9dfb7938e3c6eb54510a0fcddacb50dcb090f07159af761ab6d +SHA512 (kernel-kabi-dw-5.18.2-200.tar.bz2) = 791144af8e4890ff6bbd101960cf0cffb6fe538a0faa09b7422532c3a27e6fe3a922b9f6a658c118403f820e1d896921dfe9b8e77bb37e984fd84cb06e24935e |