diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-25 10:14:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-25 10:14:11 +0200 |
| commit | b14302a8c835befaa67f7adfc01514b6e80a9b74 (patch) | |
| tree | 0c2230284e9fa2a43abd274b5a0511526aaeb97f | |
| parent | d825b7ec7a402e2a67c7063731e92f4689e5f8fd (diff) | |
| parent | 20602ec6c1b74c305c8a7aa3d7c20fb1dab82c53 (diff) | |
| download | kernel-b14302a8c835befaa67f7adfc01514b6e80a9b74.tar.gz kernel-b14302a8c835befaa67f7adfc01514b6e80a9b74.tar.xz kernel-b14302a8c835befaa67f7adfc01514b6e80a9b74.zip | |
Merge remote-tracking branch 'origin/f34' into f34-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 61ad120a6..a529b3877 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-100.tar.bz2) = afc0acdf322257055a1634612f34b2bdf51125b83393158e8c70d681a4e613e4c08a6205137a070e3b6b1df3239467575c2162bfb877722e1cd8f323a6fd7913 -SHA512 (kernel-kabi-dw-5.17.8-100.tar.bz2) = f6b63ca9f35810863da59334b09db97908c0246d7da0e5399354e8a4929aab65b9e0c9ee01a117ecbdc16416712ea21cb82771877a24a8e7d11abec36354a19f +SHA512 (linux-5.17.9.tar.xz) = b78f45f3001d63801353145ad54525848ad12cbdfaa460d51dc2a8ff0ac3172281aed4b78a876b862e5ccf323a6d51d7d3dfe03e54b13e526fbc8972e9e1c175 +SHA512 (kernel-abi-stablelists-5.17.9-100.tar.bz2) = 6e5f0f7d681bf5273d51c983aa8af92af45c764e2fcdc5ad33e1e8d282a4b738f2e1450507d5db3898c1bf95c2211bc9398b64a8e3c09cb8eb2c862301158f5c +SHA512 (kernel-kabi-dw-5.17.9-100.tar.bz2) = a479834338f3a72e0b7c66cc7c7ed93a291f66daa947969bb5263c5ffacc3896e9ef9d6c7febe2303b3b3a01edc374d9f04cf417b4afbbc5ed7d00c849a5cbff |