From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Heiko Carstens <heiko.carstens@de•ibm.com>,
Martin Schwidefsky <schwidefsky@de•ibm.com>
Cc: Mark Brown <broonie@kernel•org>,
Kirill Tkhai <ktkhai@virtuozzo•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the s390 tree
Date: Mon, 13 Nov 2017 16:30:33 +1100 [thread overview]
Message-ID: <20171113163023.0e5bbe50@canb.auug.org.au> (raw)
In-Reply-To: <20171011155145.sfrwpb3b3rol7l3i@sirena.co.uk>
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
next prev parent reply other threads:[~2017-11-13 5:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 15:51 linux-next: manual merge of the tip tree with the s390 tree Mark Brown
2017-11-13 5:30 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-19 4:54 Stephen Rothwell
2025-03-19 19:50 ` Ingo Molnar
2025-03-28 14:16 ` Joel Granados
2025-03-26 1:28 ` Stephen Rothwell
2023-04-18 13:40 broonie
2023-02-10 1:00 Stephen Rothwell
2023-02-21 23:03 ` Stephen Rothwell
2019-05-06 6:58 Stephen Rothwell
2017-11-01 6:04 Stephen Rothwell
2015-08-20 5:32 Stephen Rothwell
2013-02-07 2:50 Stephen Rothwell
2012-03-14 3:46 Stephen Rothwell
2009-08-24 7:01 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171113163023.0e5bbe50@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=ktkhai@virtuozzo$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox