diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
| commit | 3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e (patch) | |
| tree | f49795de3f8aaae86e73f6a1f21b7b1948048311 /0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | |
| parent | c01e23554af1d0635829396c9b8b7f5040a2d7d3 (diff) | |
| parent | 427e0b0cd9f365866f7b2517c77ed712f5df9cc7 (diff) | |
| download | kernel-5.9.0-0.rc2.1.vanilla.2.fc33.tar.gz kernel-5.9.0-0.rc2.1.vanilla.2.fc33.tar.xz kernel-5.9.0-0.rc2.1.vanilla.2.fc33.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.1.vanilla.2.fc34kernel-5.9.0-0.rc2.1.vanilla.2.fc33kernel-5.9.0-0.rc2.1.vanilla.2.fc32kernel-5.9.0-0.rc2.1.vanilla.2.fc31
Diffstat (limited to '0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch')
| -rw-r--r-- | 0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch index 507ba5cd7..8d445b6ee 100644 --- a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch +++ b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch @@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com> 2 files changed, 96 insertions(+), 31 deletions(-) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index fdd1db025dbf..8ef7d1df09dd 100644 +index 3aa07c3b5136..833c35abd009 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -26,7 +26,7 @@ index fdd1db025dbf..8ef7d1df09dd 100644 #include <asm/early_ioremap.h> -@@ -831,40 +832,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -833,40 +834,101 @@ int efi_mem_type(unsigned long phys_addr) } #endif |