| Message ID | 20180312084500.10764-1-ard.biesheuvel@linaro.org |
|---|---|
| Headers | show |
| Series | more EFI changes for v4.17 | expand |
On 12 March 2018 at 09:26, Ingo Molnar <mingo@kernel.org> wrote: > > * Ingo Molnar <mingo@kernel.org> wrote: > >> > -static pgd_t *efi_pgd; >> > - >> >> Hm, so there's some interaction here with: >> >> 116fef640859: x86/mm/dump_pagetables: Add the EFI pagetable to the debugfs 'page_tables' directory >> >> which is in tip:x86/mm. >> >> Could you please resolve that conflict? I'll sort out the topic branches >> afterwards. > > So I've resolved it the following way, I merged the conflicting commit into > tip:efi/core and applied the 3 unrelated patches from your series: > > 36b649760e94: efi: Use string literals for efi_char16_t variable initializers > 136d5d57e35c: efi/esrt: Fix handling of early ESRT table mapping > 7e904a91bf60: efi: Use efi_mm in x86 as well as ARM > b0599e2801df: Merge branch 'x86/mm' into efi/core > > and pushed it out. > > So if you could resolve the two conflicting patches on top of 36b649760e94 then we > should be good going forward. > By 'resolve' you mean rebase and resend, right?
The following changes since commit f779ca740f25c8a6a72d951334f9efc3158a318b: efi: Make const array 'apple' static (2018-03-09 09:30:35 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-next for you to fetch changes up to a6072c0ecf3a39e9eadfaea1477533fd24261b05: efi: use string literals for efi_char16_t variable initializers (2018-03-10 11:05:19 +0000) ---------------------------------------------------------------- Second batch of EFI changes for v4.17: - take 2 of 'use efi_switch_mm() on x86 instead of manipulating %cr3 directly' - fix early memremap leak in ESRT code - switch to L"xxx" notation for wide string literals ---------------------------------------------------------------- Ard Biesheuvel (2): efi/esrt: fix handling of early ESRT table mapping efi: use string literals for efi_char16_t variable initializers Sai Praneeth (3): efi: Use efi_mm in x86 as well as ARM x86/efi: Replace efi_pgd with efi_mm.pgd x86/efi: Use efi_switch_mm() rather than manually twiddling with %cr3 arch/x86/boot/compressed/eboot.c | 3 +- arch/x86/include/asm/efi.h | 26 ++++++-------- arch/x86/platform/efi/efi_64.c | 59 +++++++++++++++++-------------- arch/x86/platform/efi/efi_thunk_64.S | 2 +- arch/x86/platform/efi/quirks.c | 8 +++-- drivers/firmware/efi/arm-runtime.c | 9 ----- drivers/firmware/efi/efi.c | 9 +++++ drivers/firmware/efi/esrt.c | 17 +++------ drivers/firmware/efi/libstub/Makefile | 2 +- drivers/firmware/efi/libstub/secureboot.c | 12 ++----- drivers/firmware/efi/libstub/tpm.c | 7 ++-- include/linux/efi.h | 2 ++ 12 files changed, 72 insertions(+), 84 deletions(-)