diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-09 10:52:20 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-09 10:52:20 +0200 |
commit | 32f784c10fc1bb0a7ee215a400ec8850af5b4dee (patch) | |
tree | 4aa62fe2788eb15652c0815dc28930c957370997 | |
parent | 4a1542b024b4cb02174f1ffbac88e5249207c6c3 (diff) | |
parent | 43b5eafaa12bfb98749665584aa5398b047c6ceb (diff) | |
download | kernel-32f784c10fc1bb0a7ee215a400ec8850af5b4dee.tar.gz kernel-32f784c10fc1bb0a7ee215a400ec8850af5b4dee.tar.xz kernel-32f784c10fc1bb0a7ee215a400ec8850af5b4dee.zip |
Merge remote-tracking branch 'origin/f36' into f36-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 c96843866..cc2c22ac7 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-300.tar.bz2) = 78ddae08718f2b52ba8a5d0618687319fe901bb71185b7e14302bdef93354a50c2d510e49e0e9f3e802583c0d2091801f405a958c1de5963e416c4b5fd51a2ee -SHA512 (kernel-kabi-dw-5.17.12-300.tar.bz2) = 92d19a7604057d7c6997250dd0313b8a8d0b1d664dc99d022e4e8230d84cd1157ef954ff3cea4e9c3f98c2ab54126b48b12d6a92c36d6188223366ef431b55f0 +SHA512 (linux-5.17.13.tar.xz) = ff9800e18d7d3d979d1298dc68c7bbcd71ee0e67163e18e1ac327e95cff23434074fcca75cc199e0876b7053036e9387bca075af22756da442e53c3823d231dc +SHA512 (kernel-abi-stablelists-5.17.13-300.tar.bz2) = 7232560b2bdabfa81be29a358ce271a1dd389b624342e6c3b1ac5964d69277161071f99f94d251babdbbc9f58515c94636593209b5605d3f37e008a3f2d59592 +SHA512 (kernel-kabi-dw-5.17.13-300.tar.bz2) = 791144af8e4890ff6bbd101960cf0cffb6fe538a0faa09b7422532c3a27e6fe3a922b9f6a658c118403f820e1d896921dfe9b8e77bb37e984fd84cb06e24935e |