diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-09 11:00:50 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-09 11:00:50 +0200 |
commit | 8d929605c2f3f84578bd8f4989ef1ad4bec4dce9 (patch) | |
tree | 35dbd7278f8f70b8ada915a1023a4458b0f5142c | |
parent | 6672f2d221b5661b69d77c18fc9c7b796610ef82 (diff) | |
parent | 549d93396cdd2ccf62fddb16a6f1d0adae866dc5 (diff) | |
download | kernel-8d929605c2f3f84578bd8f4989ef1ad4bec4dce9.tar.gz kernel-8d929605c2f3f84578bd8f4989ef1ad4bec4dce9.tar.xz kernel-8d929605c2f3f84578bd8f4989ef1ad4bec4dce9.zip |
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
-rwxr-xr-x | kernel.spec | 4 | ||||
-rw-r--r-- | patch-5.17-redhat.patch | 2 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index ff7a50cc7..d53f2897e 100755 --- a/kernel.spec +++ b/kernel.spec @@ -3020,6 +3020,10 @@ fi # # %changelog +* Mon Jun 06 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.13-0] +- Drop F34 from release targets (Justin M. Forbes) +- Add the fedora-stable-release.sh script to generate stable dist-git (Justin M. Forbes) + * Mon May 30 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.12-0] - Revert "crypto: rng - Override drivers/char/random in FIPS mode" (Justin M. Forbes) - Revert "random: Add hook to override device reads and getrandom(2)" (Justin M. Forbes) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 358dea787..539c634ac 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -109,7 +109,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 25c44dda0ef3..5af0d61c0782 100644 +index d38228d336bf..5afb968d0add 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-5.17.12.tar.xz) = bdf54320810a1ed1b303b89730aec2fa0e68e45b96c813a15f5cca60e6ce765c0b1a3d4fd39317765227429f206172c709df17741138c6b3e7cbc73ca98cb61d -SHA512 (kernel-abi-stablelists-5.17.12-200.tar.bz2) = 378bb77e2b5d814751979086eb24e4d692c5e7f3875210ddde2d6418b745f8ef25c9fd4b97daedfc05d8c816b9d16da2a062453a4ab0d4b8c8659a70c0b18d6b -SHA512 (kernel-kabi-dw-5.17.12-200.tar.bz2) = 92d19a7604057d7c6997250dd0313b8a8d0b1d664dc99d022e4e8230d84cd1157ef954ff3cea4e9c3f98c2ab54126b48b12d6a92c36d6188223366ef431b55f0 +SHA512 (linux-5.17.13.tar.xz) = ff9800e18d7d3d979d1298dc68c7bbcd71ee0e67163e18e1ac327e95cff23434074fcca75cc199e0876b7053036e9387bca075af22756da442e53c3823d231dc +SHA512 (kernel-abi-stablelists-5.17.13-200.tar.bz2) = 49e4fece155600d49c6b4420269cc2b77f0748d7c1fe4f52a4874517c99cef0367bc1008c4137e49d44e817657e5c114d871e6642a4e414bf0e1e93f5122b43f +SHA512 (kernel-kabi-dw-5.17.13-200.tar.bz2) = 791144af8e4890ff6bbd101960cf0cffb6fe538a0faa09b7422532c3a27e6fe3a922b9f6a658c118403f820e1d896921dfe9b8e77bb37e984fd84cb06e24935e |