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

From: Russell King - ARM Linux admin <[email-masked]>
Date: Thu, 28 May 2020 00:22:57 +0100

Ard,

Please take a look.  Obviously, whatever the resolution is going to be
needed when Linus opens the merge window.

Thanks.

On Thu, May 28, 2020 at 09:09:41AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm tree got a conflict in:
> 
>   arch/arm/boot/compressed/head.S
> 
> between commit:
> 
>   a94691680bac ("efi/arm: Deal with ADR going out of range in efi_enter_kernel()")
> 
> from Linus' tree and commit:
> 
>   d0f9ca9be11f ("ARM: decompressor: run decompressor in place if loaded via UEFI")
> 
> from the arm tree.
> 
> I fixed it up (I just used the latter) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC for 0.8m (est. 1762m) line in suburbia: sync at 13.1Mbps down 424kbps up