summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-23 15:08:51 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-23 15:08:51 +0200
commit0bf4952b5d1f757faf9917dc2bf1aaf4534b4bc5 (patch)
tree82264f5a3d4eedb6d143141beb19454ec5ee8b52
parent680e6e3f90478bfc2dad1b476d1fde2b538873c8 (diff)
parentfd0402f2c04f4e88c4a05d7d1dad680ec8f48b78 (diff)
downloadkernel-0bf4952b5d1f757faf9917dc2bf1aaf4534b4bc5.tar.gz
kernel-0bf4952b5d1f757faf9917dc2bf1aaf4534b4bc5.tar.xz
kernel-0bf4952b5d1f757faf9917dc2bf1aaf4534b4bc5.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 46b8d09e1..b1d94684a 100644
--- a/patch-5.12-redhat.patch
+++ b/patch-5.12-redhat.patch
@@ -66,7 +66,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
Boot into System Kernel
diff --git a/Makefile b/Makefile
-index 82ca490ce5f4..75fbedcd7e67 100644
+index e0a252b64463..b47c61143e46 100644
--- a/Makefile
+++ b/Makefile
@@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/sources b/sources
index 0690ac1df..89cb34434 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12.11.tar.xz) = 84dba10c2d555372d043e0cbb9824e39903d9f1ae7494a519a9e465c17111738c7acf9b0344170dc7e830a0a0616c320f3ff1935abf23480209346d02241feb4
-SHA512 (kernel-abi-whitelists-5.12.11-300.tar.bz2) = ec1efedfd22316d56343f06273f86afb110b4cdff0adb6d070f08e07e09766afb18a26d92342e82bf45d13879f4ec0b5d18d6b213330ceabccc621241bf6bb12
-SHA512 (kernel-kabi-dw-5.12.11-300.tar.bz2) = 0d7f9d9ef6d2ed3ea642eca344b69b305e5625c3602b22bf12f1b19716e9ccaa996da082c191bc49b3fc484a5b432c657c4a04236e1b3a6f51770aac6fb357c2
+SHA512 (linux-5.12.12.tar.xz) = ad404db9050475f5d02613f04ea592964ed72e2b4f3da43b37ec02405edcd8e88070cb61516c352b16aa9aab6f5dc258e8c8b63734edcc12989735ef01e60a71
+SHA512 (kernel-abi-whitelists-5.12.12-300.tar.bz2) = eb361af6051909f6777a738ef2f2d9ba73005aaeea70dfef40e608cf1a9c7a58607ef3ef8f0629c3089d4c148f85cc5bb821c0da76d91cc6326205f10981a4fd
+SHA512 (kernel-kabi-dw-5.12.12-300.tar.bz2) = 4ea3aa5aa8640f4f7ec070dde9c9e3a6f8a3b0f97598036092ad0e32beb1bbeec1274a0d5263d31bf366bc6bab3f1394fef339148234fcb362c04592280557dc