[lkml]   [2022]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the h8300 tree with the asm-generic tree
Hi all,

On Mon, 28 Feb 2022 11:41:06 +1100 Stephen Rothwell <> 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2022-03-24 23:59    [W:0.031 / U:0.352 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site