Re: [GIT PULL] EFI changes for v5.8

[Ingo Molnar]

* Ard Biesheuvel <ardb@xxxxxxxxxx> wrote:

> On Mon, 1 Jun 2020 at 15:24, Ingo Molnar <mingo@xxxxxxxxxx> wrote:
> >
> > Linus,
> >
> > Please pull the latest efi/core git tree from:
> >
> >    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-core-2020-06-01
> >
> >    # HEAD: e9524fb97ab5b41b85e1d3408f8e513433798f3c efi/x86: Don't blow away existing initrd
> >
> > The EFI changes for this cycle are:
> >
> >  - preliminary changes for RISC-V
> >  - Add support for setting the resolution on the EFI framebuffer
> >  - Simplify kernel image loading for arm64
> >  - Move .bss into .data via the linker script instead of relying on symbol
> >    annotations.
> >  - Get rid of __pure getters to access global variables
> >  - Clean up the config table matching arrays
> >  - 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
> >  - Simplify GDT handling in early mixed mode thunking code
> >  - Some other minor fixes and cleanups
> >
> >  Thanks,
> >
> >         Ingo
> >
> 
> Please note that Stephen reported a conflict with the ARM32 tree, due
> to the replacement of all instances of pr_efi_err() with efi_err(),
> including a couple in some ARM code that is being modified.
> 
> https://lore.kernel.org/linux-next/20200529152907.2205a298@xxxxxxxxxxxxxxxx/

Indeed!

Since these semantic conflicts and build failures would not trigger on 
Linus's test builds normally, it might make sense to double check that 
this comes up empty after both the EFI and the arm32 merge:

  thule:~/tip> git grep -w pr_efi_err
  thule:~/tip> 

Thanks,

	Ingo