diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-25 10:14:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-25 10:14:07 +0200 |
| commit | d68487395372455dfe6cc17a7999c9df0118adda (patch) | |
| tree | bded6ee039dcd67c5cb86902701986868b5da9ed | |
| parent | dd1cfd0a0baa3ee8927552cb21d081eb6d0fa9a6 (diff) | |
| parent | 6e8311fd639e7ee3a1b538e98161536396892293 (diff) | |
| download | kernel-d68487395372455dfe6cc17a7999c9df0118adda.tar.gz kernel-d68487395372455dfe6cc17a7999c9df0118adda.tar.xz kernel-d68487395372455dfe6cc17a7999c9df0118adda.zip | |
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 3 | ||||
| -rw-r--r-- | patch-5.17-redhat.patch | 4 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index 59deeda1a..cb6f456f6 100755 --- a/kernel.spec +++ b/kernel.spec @@ -3020,6 +3020,9 @@ fi # # %changelog +* Wed May 18 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.9-0] +- Fix changelog for 5.17.8 (Justin M. Forbes) + * Sun May 15 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.8-0] - Linux v5.17.8 diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 07901a9c3..42a316da2 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -111,7 +111,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 3cf179812f0f..ca873b29f0b2 100644 +index aba139bbd1c7..01a8c0b291ac 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1917,7 +1917,7 @@ index d1f34229e11a..e828504cc396 100644 if (error < 0) return error; diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c -index ea17fa1f31ec..e2d59bb5e6bb 100644 +index d20891162145..9a16897e8dc6 100644 --- a/fs/nfs/fs_context.c +++ b/fs/nfs/fs_context.c @@ -80,6 +80,7 @@ enum nfs_param { @@ -1,3 +1,3 @@ -SHA512 (linux-5.17.8.tar.xz) = 20d9e1772503d7a0b290375795e218aacdd79b56e6e04693cb938c5da3739e5e5219daa3fa0871ebb57ad9e35cfd9007abefad01cf3c9906402c78ff31680c98 -SHA512 (kernel-abi-stablelists-5.17.8-200.tar.bz2) = d02ce7a5ac9879872b9f4c6eb2bb49208e70952097d908e32f8c2e11f586205582505943d25e1b3d37c2b75f443ffa13739f2871c41534cc211fe70aac0df613 -SHA512 (kernel-kabi-dw-5.17.8-200.tar.bz2) = f6b63ca9f35810863da59334b09db97908c0246d7da0e5399354e8a4929aab65b9e0c9ee01a117ecbdc16416712ea21cb82771877a24a8e7d11abec36354a19f +SHA512 (linux-5.17.9.tar.xz) = b78f45f3001d63801353145ad54525848ad12cbdfaa460d51dc2a8ff0ac3172281aed4b78a876b862e5ccf323a6d51d7d3dfe03e54b13e526fbc8972e9e1c175 +SHA512 (kernel-abi-stablelists-5.17.9-200.tar.bz2) = fb285216ea69b210d7d7f7668f45a46cec55d5d37f94d5ca839d5088dfe30f36f83002ec2b2cf0274d40b0eb578852f677ca149e972c0f783856940e0b97c407 +SHA512 (kernel-kabi-dw-5.17.9-200.tar.bz2) = a479834338f3a72e0b7c66cc7c7ed93a291f66daa947969bb5263c5ffacc3896e9ef9d6c7febe2303b3b3a01edc374d9f04cf417b4afbbc5ed7d00c849a5cbff |