From 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 30 Sep 2020 10:55:26 -0500
Subject: 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>
---
 0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch')

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
 
-- 
cgit