[lkml]   [2018]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the arm64 tree with Linus' tree
Hi Stephen,

On Tue, Jul 24, 2018 at 08:50:15AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
> arch/arm64/Makefile
> between commits:
> 38fc42486775 ("arm64: Use aarch64elf and aarch64elfb emulation mode variants")
> 2893af07e507 ("arm64: add endianness option to LDFLAGS instead of LD")
> 96f95a17c1cf ("Revert "arm64: Use aarch64elf and aarch64elfb emulation mode variants"")
> from Linus' tree and commit:
> c931d34ea085 ("arm64: build with baremetal linker target instead of Linux when available")
> from the arm64 tree.
> I fixed it up (I just used the latter version) 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.

Thanks; that is the correct resolution.


 \ /
  Last update: 2018-07-24 11:30    [W:0.054 / U:1.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site