diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-05-25 12:09:26 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-05-25 12:09:26 -0500 |
| commit | a79d8affb70a95069c35a0ccf7085e230c22a98d (patch) | |
| tree | 735071b1735973c686bd83bce8bff60e7590071b /0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | |
| parent | 891d5e1e47a0cd4c67d6d2187954a885edaf47d1 (diff) | |
| download | kernel-a79d8affb70a95069c35a0ccf7085e230c22a98d.tar.gz kernel-a79d8affb70a95069c35a0ccf7085e230c22a98d.tar.xz kernel-a79d8affb70a95069c35a0ccf7085e230c22a98d.zip | |
kernel-5.7.0-0.rc7.1
* Mon May 25 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc7.1]
- v5.7-rc7 rebase
- Updated changelog for the release based on caffb99b6929 ("CKI@GitLab")
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 | 6 |
1 files changed, 3 insertions, 3 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 094ca2623..ee11a2428 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 911a2bd0f6b7..3696e87f19ee 100644 +index 4e3055238f31..36ca9e2943ce 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -26,7 +26,7 @@ index 911a2bd0f6b7..3696e87f19ee 100644 #include <asm/early_ioremap.h> -@@ -831,40 +832,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -828,40 +829,101 @@ int efi_mem_type(unsigned long phys_addr) } #endif @@ -160,7 +160,7 @@ index 911a2bd0f6b7..3696e87f19ee 100644 static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock); diff --git a/include/linux/efi.h b/include/linux/efi.h -index 251f1f783cdf..fa8e23680314 100644 +index 9430d01c0c3d..51503bf118ab 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -42,6 +42,8 @@ |