diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-09-30 10:55:26 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-09-30 10:55:26 -0500 |
commit | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (patch) | |
tree | e2baee2da7d349311c64f206a6a3dd6eb8935211 /0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | |
parent | 430af957008fa73bd81840a407110ed7a979ae02 (diff) | |
download | kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.gz kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.xz kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.zip |
kernel-5.9.0-0.rc7.20200930gitfb0155a09b02.21
* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21]
- Merge ark-patches
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
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 e351498af..79118e12f 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 3aa07c3b5136..833c35abd009 100644 +index fdd1db025dbf..8ef7d1df09dd 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -26,7 +26,7 @@ index 3aa07c3b5136..833c35abd009 100644 #include <asm/early_ioremap.h> -@@ -833,40 +834,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -831,40 +832,101 @@ int efi_mem_type(unsigned long phys_addr) } #endif |