summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-23 15:08:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-23 15:08:55 +0200
commita1ca80a66061c698423d11ef553cb655485160c2 (patch)
tree466095f9870edf7f7062dfbe40c6e3f72d33c8e3
parentdcedf2018b0611fe7ceb331ff33f512355ac2cd1 (diff)
parent0ff92564ea1f11dee71b6b966797a8963c50b571 (diff)
downloadkernel-a1ca80a66061c698423d11ef553cb655485160c2.tar.gz
kernel-a1ca80a66061c698423d11ef553cb655485160c2.tar.xz
kernel-a1ca80a66061c698423d11ef553cb655485160c2.zip
Merge remote-tracking branch 'origin/f33' into f33-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 15f43c801..5dd5b66fb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12.11.tar.xz) = 84dba10c2d555372d043e0cbb9824e39903d9f1ae7494a519a9e465c17111738c7acf9b0344170dc7e830a0a0616c320f3ff1935abf23480209346d02241feb4
-SHA512 (kernel-abi-whitelists-5.12.11-200.tar.bz2) = 55a040fcbcfcbef51ff6ed517a3f56b434ebaf17f443da4540a03a16abbab665d3a8ff73238c7eb6c62daac46cc6ac7d6dc2721aab823c5b0c95f62bba44f559
-SHA512 (kernel-kabi-dw-5.12.11-200.tar.bz2) = 0d7f9d9ef6d2ed3ea642eca344b69b305e5625c3602b22bf12f1b19716e9ccaa996da082c191bc49b3fc484a5b432c657c4a04236e1b3a6f51770aac6fb357c2
+SHA512 (linux-5.12.12.tar.xz) = ad404db9050475f5d02613f04ea592964ed72e2b4f3da43b37ec02405edcd8e88070cb61516c352b16aa9aab6f5dc258e8c8b63734edcc12989735ef01e60a71
+SHA512 (kernel-abi-whitelists-5.12.12-200.tar.bz2) = 07acacf6cebc1f316cedbf2f40989311a78513cb0de1c7fbde02ba134c4ff07766a5d72ddc61859288a7462072727eb140b1d7069ce626c2cf9c25af4637ff62
+SHA512 (kernel-kabi-dw-5.12.12-200.tar.bz2) = 4ea3aa5aa8640f4f7ec070dde9c9e3a6f8a3b0f97598036092ad0e32beb1bbeec1274a0d5263d31bf366bc6bab3f1394fef339148234fcb362c04592280557dc