Merge tag 'efi-changes-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Mon, 25 May 2020 13:11:14 +0000 (15:11 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 25 May 2020 13:11:14 +0000 (15:11 +0200)
commitd1343da330f6ff3f40abf1f360d4701af784b85a
tree16f4b06e6e7d458402b265c1cb0d36a426716aed
parenta5d8e55b2c7d3d18d7837af0ef8d1477eeeb919c
parent9241dfe7f2772fc73c82eb950afb1c795d2c012c
Merge tag 'efi-changes-for-v5.8' of git://git./linux/kernel/git/efi/efi into efi/core

More EFI changes for v5.8:

 - Rename pr_efi/pr_efi_err to efi_info/efi_err, and use them consistently
 - Simplify and unify initrd loading
 - Parse the builtin command line on x86 (if provided)
 - Implement printk() support, including support for wide character strings
 - Some fixes for issues introduced by the first batch of v5.8 changes
 - Fix a missing prototypes warning
 - Simplify GDT handling in early mixed mode thunking code
 - Some other minor fixes and cleanups

Conflicts:
drivers/firmware/efi/libstub/efistub.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/firmware/efi/libstub/efi-stub.c
drivers/firmware/efi/libstub/efistub.h
drivers/firmware/efi/libstub/tpm.c
drivers/firmware/efi/libstub/x86-stub.c
include/linux/efi.h