Re: linux-next: manual merge of the arm tree with Linus' tree

[Ard Biesheuvel]

On Thu, 28 May 2020 at 01:23, Russell King - ARM Linux admin
<linux@xxxxxxxxxxxxxxx> wrote:
>
> Ard,
>
> Please take a look.  Obviously, whatever the resolution is going to be
> needed when Linus opens the merge window.
>

Sorry for that.

I have pushed the signed tag below to resolve it. Those changes were
already in v5.7-rc2, so I wouldn't expect this to cause more trouble.
If you prefer, you could merge v5.7-rc2 into your tree directly
instead.



The following changes since commit d0f9ca9be11f25ef4151195eab7ea36d136084f6:

  ARM: decompressor: run decompressor in place if loaded via UEFI
(2020-05-19 18:23:22 +0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git
efi-arm-resolve-conflict-v5.8-for-rmk

for you to fetch changes up to 5aa87eb1b4e3f1b50ee4a42e8cd933d3d39927b3:

  Merge commit 'a94691680bac' into efi-arm-no-relocate to resolve
conflict (2020-05-28 08:50:46 +0200)

----------------------------------------------------------------
Resolve a merge conflict between v5.7-rc2 and rmk/for-next

----------------------------------------------------------------

Ard Biesheuvel (2):
      efi/arm: Deal with ADR going out of range in efi_enter_kernel()
      Merge commit 'a94691680bac' into efi-arm-no-relocate to resolve conflict

Arvind Sankar (2):
      efi/x86: Move efi stub globals from .bss to .data
      efi/x86: Always relocate the kernel for EFI handover entry

Colin Ian King (1):
      efi/libstub/x86: Remove redundant assignment to pointer hdr

Takashi Iwai (1):
      efi/cper: Use scnprintf() for avoiding potential buffer overflow


 drivers/firmware/efi/cper.c             |  2 +-
 drivers/firmware/efi/libstub/efistub.h  |  2 +-
 drivers/firmware/efi/libstub/x86-stub.c | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)