diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-23 15:19:50 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-23 15:19:50 +0200 |
| commit | cf2fd1f7e4b09d7a6482a953235b0ea3834f62c4 (patch) | |
| tree | 108a9de21b5fbde0e6166894b8c06b9436c6971e | |
| parent | 2a1dff04d60eeee8f60bb160bfb991dd2a44f134 (diff) | |
| parent | 87d2b692ccf20c861756944b686651bbc0b31817 (diff) | |
| download | kernel-cf2fd1f7e4b09d7a6482a953235b0ea3834f62c4.tar.gz kernel-cf2fd1f7e4b09d7a6482a953235b0ea3834f62c4.tar.xz kernel-cf2fd1f7e4b09d7a6482a953235b0ea3834f62c4.zip | |
Merge remote-tracking branch 'origin/f36' into f36-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 4beda5cc2..52f53ae3d 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-300.tar.bz2) = a29866baec21c4f1fb5e0b16f17ffd53738ce6838400ca3c6b5a5fd3a9053e3a7a676e58de37eb0f7a7072ea0b92456ba9062f281b21dab6b716b0e0c26dd25f -SHA512 (kernel-kabi-dw-5.17.8-300.tar.bz2) = f6b63ca9f35810863da59334b09db97908c0246d7da0e5399354e8a4929aab65b9e0c9ee01a117ecbdc16416712ea21cb82771877a24a8e7d11abec36354a19f +SHA512 (linux-5.17.9.tar.xz) = b78f45f3001d63801353145ad54525848ad12cbdfaa460d51dc2a8ff0ac3172281aed4b78a876b862e5ccf323a6d51d7d3dfe03e54b13e526fbc8972e9e1c175 +SHA512 (kernel-abi-stablelists-5.17.9-300.tar.bz2) = 2d27c6075d6dae7a2851fe03ef38282e7ba887f9b9c3ddb2eebdf2d65b8b7480a1637eebbc5628a22b88217d8a39d855e94875e1693a591ccfd6e5d2de706601 +SHA512 (kernel-kabi-dw-5.17.9-300.tar.bz2) = a479834338f3a72e0b7c66cc7c7ed93a291f66daa947969bb5263c5ffacc3896e9ef9d6c7febe2303b3b3a01edc374d9f04cf417b4afbbc5ed7d00c849a5cbff |