Re: linux-next: manual merge of the memblock tree with the mm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 992 bytes --]

Hi all,

On Thu, 1 Aug 2024 14:10:47 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the memblock tree got a conflict in:
> 
>   tools/testing/shared/linux/init.h
> 
> between commit:
> 
>   265291d604a6 ("tools: separate out shared radix-tree components")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   f56de2214554 ("tools/testing: abstract two init.h into common include directory")
> 
> from the memblock tree.
> 
> I fixed it up (I removed the file) 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.

This is now a conflict between the memblock tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]