linux-next: manual merge of the s390 tree with the kbuild tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the s390 tree with the kbuild tree
Date	2017-03-28 01:40 +0200
Message-ID	<tpMoV-7gK-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi all,

Today's linux-next merge of the s390 tree got a conflict in:

  arch/s390/include/uapi/asm/Kbuild

between commit:

  65017bab8a9e ("uapi: export all headers under uapi directories")

from the kbuild tree and commit:

  916cda1aa1b4 ("s390: add a system call for guarded storage")

from the s390 tree.

I fixed it up (the form should supercede the latter, so I used the former)
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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the s390 tree with the kbuild tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-28 01:40 +0200

csiph-web