lkml.org 
[lkml]   [2019]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the sh tree with Linus' tree
Hi all,

Today's linux-next merge of the sh tree got conflicts in:

arch/sh/include/uapi/asm/setup.h
arch/sh/include/uapi/asm/types.h

between commit:

d9c525229521 ("treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers")

from Linus' tree and commit:

cd10afbc932d ("sh: remove unneeded uapi asm-generic wrappers")

from the sh tree.

I fixed it up (I just removed the files) 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2019-07-29 01:25    [W:0.062 / U:23.488 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site