Re: [PATCH 2/5] x86/efi: Replace efi_pgd with efi_mm.pgd
* Ard Biesheuvel wrote: > On 12 March 2018 at 09:26, Ingo Molnar wrote: > > > > * Ingo Molnar 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? Yeah. I expected it to probably be a bit more work than a regular rebase, because we grew a new efi_pgd user and I didn't want to trivialize the conflict resolution effort - hence the 'resolve the conflict' formulation! :-) Thanks, Ingo
Re: [PATCH 2/5] x86/efi: Replace efi_pgd with efi_mm.pgd
On 12 March 2018 at 09:26, Ingo Molnar wrote: > > * Ingo Molnar 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?
Re: [PATCH 2/5] x86/efi: Replace efi_pgd with efi_mm.pgd
* Ingo Molnar 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. Thanks, Ingo
Re: [PATCH 2/5] x86/efi: Replace efi_pgd with efi_mm.pgd
* Ard Biesheuvel wrote: > From: Sai Praneeth > > Since the previous patch added support for efi_mm, let's handle efi_pgd > through efi_mm and remove global variable efi_pgd. > > Signed-off-by: Sai Praneeth Prakhya > Cc: "Lee, Chun-Yi" > Cc: Borislav Petkov > Cc: Tony Luck > Cc: Andy Lutomirski > Cc: Michael S. Tsirkin > Cc: Bhupesh Sharma > Cc: Ricardo Neri > Cc: Ravi Shankar > Tested-by: Bhupesh Sharma > Reviewed-by: Matt Fleming > Signed-off-by: Ard Biesheuvel > --- > arch/x86/platform/efi/efi_64.c | 17 - > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c > index 0045efe9947b..8881e601c32d 100644 > --- a/arch/x86/platform/efi/efi_64.c > +++ b/arch/x86/platform/efi/efi_64.c > @@ -190,8 +190,6 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd) > early_code_mapping_set_exec(0); > } > > -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. Thanks, Ingo