Messages in this thread | | | Date | Mon, 13 Nov 2017 16:30:33 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the tip tree with the s390 tree |
| |
Hi all,
On Wed, 11 Oct 2017 16:51:45 +0100 Mark Brown <broonie@kernel.org> wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/s390/include/asm/rwsem.h > > between commit: > > 91a1fad759ffd ("s390: use generic rwsem implementation") > > from the s390 tree and commit: > > a61ba2c8a48f1 ("locking/arch, s390: Add __down_read_killable()") > > from the tip tree. > > I fixed it up by re-deleting 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.
Just a reminder that this conflict still exists.
-- Cheers, Stephen Rothwell
| |