summaryrefslogtreecommitdiffstats
path: root/patch-5.16-redhat.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-12-31 13:33:30 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-12-31 13:33:30 +0100
commit1c046010ed2073cffec9f877ea510ef700b70279 (patch)
treebe0edc022b358092fdeec64c5723fb0efc0e4912 /patch-5.16-redhat.patch
parentea5ab94eb41f781b349cc279a7faca88057bee8e (diff)
parent11cdcc6e3038b0d24c68f9820e6095ac15757a65 (diff)
downloadkernel-1c046010ed2073cffec9f877ea510ef700b70279.tar.gz
kernel-1c046010ed2073cffec9f877ea510ef700b70279.tar.xz
kernel-1c046010ed2073cffec9f877ea510ef700b70279.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc7.20211229gite7c124bd0463.50.vanilla.1.fc35
Diffstat (limited to 'patch-5.16-redhat.patch')
-rw-r--r--patch-5.16-redhat.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index d63157d45..029143a7b 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -2141,7 +2141,7 @@ index 778b57b1f020..2a152330076d 100644
if (xfs_has_discard(mp)) {
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index dbd39b20e034..8127dcbe5a6e 100644
+index ef8dbc0a1522..836a5dfc6156 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -43,6 +43,8 @@