Messages in this thread | | | Date | Mon, 15 Apr 2019 14:21:34 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the arm64 tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/s390/include/asm/Kbuild
between commit:
fdcd06a8ab77 ("arch: Use asm-generic header for asm/mmiowb.h")
from the arm64 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/s390/include/asm/Kbuild index bdc4f06a04c5,d5fadefea33c..000000000000 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild @@@ -20,8 -20,6 +20,7 @@@ generic-y += local. generic-y += local64.h generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h +generic-y += mmiowb.h - generic-y += rwsem.h generic-y += trace_clock.h generic-y += unaligned.h generic-y += word-at-a-time.h [unhandled content-type:application/pgp-signature] | |