summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-07-11 13:30:35 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-07-11 13:30:35 +0200
commit650f4f2664dd8bead3645356e3aaaf4e1d00c852 (patch)
tree3bded622c2736a0598e5bec67b00acb453dd87a8
parentb77e9c5711b91ac7d53e3f301562bdf0c66b036e (diff)
parentbaeb476246c66cdc0ceffa6ffe156237c7e7b0df (diff)
downloadkernel-650f4f2664dd8bead3645356e3aaaf4e1d00c852.tar.gz
kernel-650f4f2664dd8bead3645356e3aaaf4e1d00c852.tar.xz
kernel-650f4f2664dd8bead3645356e3aaaf4e1d00c852.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 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 8f9a3f083..9afcf5e6d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12.14.tar.xz) = c5c5e8c11c4ad5bc72a476665b62afd65175ee631ec7af9a002e097ac2dd01a1c485d5f58cb85be4b236bbf02570852fa321000f71f1f2b18ec75866af7792da
-SHA512 (kernel-abi-whitelists-5.12.14-300.tar.bz2) = 5ffd015e522ea69a1b1b08a97d7b4f02bcde10c6e1b7349604891027a697e58c87889d63ba9abdf323b4828b5d8b34866967e3bf156c74eab02d32704ab5f74d
-SHA512 (kernel-kabi-dw-5.12.14-300.tar.bz2) = 4770204e7c20b43f6fa3b611580b6eb83897b0a6e8e65997eb68c2e128981e2a9329635e9798cf5c28bd6fed8f6afd31def86bfc6fdcf20cfa281c7e2b5c7cdf
+SHA512 (linux-5.12.15.tar.xz) = ce2ec26c9cf179566e5c4366c05757b0847e0cd93a9d52f43120afefb09990ff601f52f0002772388a0e2b108d3d8a77611343139165a4ef3641dc9a42729d03
+SHA512 (kernel-abi-whitelists-5.12.15-300.tar.bz2) = 7c9f1c7348e69760a890c1f4d2178e5b9a3f9da839ec3f2f2dc9a437f9859d7c7f48d07304cbee7e277e5b1dd09b935223b1dcd9d422ea3d12eda9cf5e57e193
+SHA512 (kernel-kabi-dw-5.12.15-300.tar.bz2) = ef817adfa46a2e6587ef07e207aceb8026d2fc442916e5c2ddb8b3b56acdb35c693e3cfe95f88c5d78ae234d3ad9c702c6f2775c2658f59840832f21018e4dd8