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

[Linus Torvalds]

On Mon, Jun 1, 2020 at 7:42 AM Ard Biesheuvel <ardb@xxxxxxxxxx> wrote:
>
> 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.

Ok, I'll try to remember, but I probably won't. So it would be lovely
to be reminded when I get the arm pull.

That said, if it's just outright conflicts, that's not a big deal and
the resolution looks trivial. But if there are actual semantic
conflicts that don't show up during the merge like Ingo implies, I
would indeed not notice due to me not doing any cross-builds.

                    Linus