summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-07-11 13:30:39 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-07-11 13:30:39 +0200
commit2fa855ac446f52468beaeba889e82f42c945bdbc (patch)
tree5cdd2d2e67f7901b8b253964c77bc250430aecb1
parent263819cd8bd7f0902e50eac9142f1773aded70fa (diff)
parent48339b21fcf92876dffdfe2e4809424bc92ef558 (diff)
downloadkernel-2fa855ac446f52468beaeba889e82f42c945bdbc.tar.gz
kernel-2fa855ac446f52468beaeba889e82f42c945bdbc.tar.xz
kernel-2fa855ac446f52468beaeba889e82f42c945bdbc.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 a9acb22ef..bad9b2cd4 100644
--- a/patch-5.12-redhat.patch
+++ b/patch-5.12-redhat.patch
@@ -67,7 +67,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
Boot into System Kernel
diff --git a/Makefile b/Makefile
-index 433f164f9ee0..56a62bea0db1 100644
+index 09e1a0967bab..63c53593ee89 100644
--- a/Makefile
+++ b/Makefile
@@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/sources b/sources
index d676a3b35..8b57319c9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12.14.tar.xz) = c5c5e8c11c4ad5bc72a476665b62afd65175ee631ec7af9a002e097ac2dd01a1c485d5f58cb85be4b236bbf02570852fa321000f71f1f2b18ec75866af7792da
-SHA512 (kernel-abi-whitelists-5.12.14-200.tar.bz2) = 72df9273ef959394b301774caa56c94156b466bc1770400ddddcf06b0a3ff72a049af26184fb74aba560d8d92da22eb1cd24bb48d3db773e5b80ec0cbd6858eb
-SHA512 (kernel-kabi-dw-5.12.14-200.tar.bz2) = 4770204e7c20b43f6fa3b611580b6eb83897b0a6e8e65997eb68c2e128981e2a9329635e9798cf5c28bd6fed8f6afd31def86bfc6fdcf20cfa281c7e2b5c7cdf
+SHA512 (linux-5.12.15.tar.xz) = ce2ec26c9cf179566e5c4366c05757b0847e0cd93a9d52f43120afefb09990ff601f52f0002772388a0e2b108d3d8a77611343139165a4ef3641dc9a42729d03
+SHA512 (kernel-abi-whitelists-5.12.15-200.tar.bz2) = 32558f0c06d1c355795e5a7296512d721ee3580f8354a9557522ef7dff712842f55aefeed31f4880ca0502341571a0c297f77bce7fb9e5b4c48a0d5f1a495517
+SHA512 (kernel-kabi-dw-5.12.15-200.tar.bz2) = ef817adfa46a2e6587ef07e207aceb8026d2fc442916e5c2ddb8b3b56acdb35c693e3cfe95f88c5d78ae234d3ad9c702c6f2775c2658f59840832f21018e4dd8