Subject: Re: linux-next: manual merge of the h8300 tree with the asm-generic tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 25 Mar 2022 09:58:35 +1100

Hi all,

On Mon, 28 Feb 2022 11:41:06 +1100 Stephen Rothwell <[email-masked]> wrote:
> 
> Today's linux-next merge of the h8300 tree got a conflict in:
> 
>   arch/h8300/mm/memory.c
> 
> between commit:
> 
>   967747bbc084 ("uaccess: remove CONFIG_SET_FS")
> 
> from the asm-generic tree and commit:
> 
>   81dd24966885 ("h8300: remove memory.c")
> 
> from the h8300 tree.
> 
> I fixed it up (I just 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 h8300 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell