summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-03 09:30:45 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-03 09:30:45 +0200
commit184c17d608ada230f9c46175144baea7c146d43c (patch)
tree84086f13b2e30b17eb872d1e2d928e6eabcdf91d
parent83eb07be6d85ef374a8382657eed522caf21d8a0 (diff)
parente9f6f85d8807e487e9d8154dee4f39d353115612 (diff)
downloadkernel-184c17d608ada230f9c46175144baea7c146d43c.tar.gz
kernel-184c17d608ada230f9c46175144baea7c146d43c.tar.xz
kernel-184c17d608ada230f9c46175144baea7c146d43c.zip
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
-rw-r--r--patch-5.12-redhat.patch2
-rw-r--r--sources6
2 files changed, 4 insertions, 4 deletions
diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch
index 8392e6139..0b95ed537 100644
--- a/patch-5.12-redhat.patch
+++ b/patch-5.12-redhat.patch
@@ -65,7 +65,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
Boot into System Kernel
diff --git a/Makefile b/Makefile
-index 6a73dee7c221..585dfe88d94c 100644
+index a20afcb7d2bf..a19908237e8a 100644
--- a/Makefile
+++ b/Makefile
@@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/sources b/sources
index 3c2cc2015..db1653750 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12.7.tar.xz) = 90c056c36a64f10a9ceb64a98b93c3fe59bcad3e00650d349a759224c83cdcba49921a53dee3b51186abfaddf06db4eb84aae17b486c8caddcaee4fb1529d339
-SHA512 (kernel-abi-whitelists-5.12.7-300.tar.bz2) = a9c97db7c2e1484867a7daeddd971951a389e213cab081a7bbf7a9dc8ccc6e91f91cf738b19ad20b1b6d6d633f9faa76b3ef524f93c7939274bdd77b948d5d30
-SHA512 (kernel-kabi-dw-5.12.7-300.tar.bz2) = 3aeeafb1005f279600a3e2e4b88f28e629fce1baa1207b46e410268aa5ee70a5eedd65986e573aad538cdb18764b30a6b10ec856c2a352c02a484cba198b0149
+SHA512 (linux-5.12.8.tar.xz) = 4af33ce63a4ce89205808bad9e84b72197ed9976d10fa8287d5690f2524cc51e542814399de08944dcb2cc2b8c708f449ed3888e10f98704d551d6ecd2236797
+SHA512 (kernel-abi-whitelists-5.12.8-300.tar.bz2) = 1520b4b8bf7f408de03ef72a9071f77fd49e86c837fa58085013c735d774f188d58310ded467bcd3b24504d0383f5ed53aa90dd69f2415bbd2237bc200021c50
+SHA512 (kernel-kabi-dw-5.12.8-300.tar.bz2) = 59c9fab14bc3126224cc133ebfaac627ce849d4a8713b1c618dc6cdbcc8a8ebd2c28b2d6959fda340ae9630c91bd8a107c11ac0b02da887fda0b4cf52a3397e9