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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 24 Apr 2019 15:10:36 +1000

Hi all,

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

  arch/arm64/include/asm/Kbuild

between commit:

  c67fdc1f00cb ("arch: mostly remove <asm/segment.h>")

from the asm-generic tree and commit:

  46ad0840b158 ("locking/rwsem: Remove arch specific rwsem files")

from the tip tree.

I fixed it up (see below) 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

diff --cc arch/arm64/include/asm/Kbuild
index afd8a3740b18,60a933b07001..000000000000
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@@ -17,7 -16,7 +17,6 @@@ generic-y += mmiowb.
  generic-y += msi.h
  generic-y += qrwlock.h
  generic-y += qspinlock.h
- generic-y += rwsem.h
 -generic-y += segment.h
  generic-y += serial.h
  generic-y += set_memory.h
  generic-y += sizes.h