From: Michael Ellerman <mpe@ellerman.id.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the rcu tree with the powerpc-fixes tree
Date: Mon, 30 Jan 2017 15:00:02 +1100 [thread overview]
Message-ID: <87y3xtw62l.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <20170130134645.5464272d@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> arch/powerpc/Kconfig
>
> between commit:
>
> f2574030b0e3 ("powerpc: Revert the initial stack protector support")
>
> from the powerpc-fixes tree and commit:
>
> c7327406b3c3 ("rcu: Make arch select smp_mb__after_unlock_lock() strength")
>
> from the rcu 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.
Thanks.
One of these years I'm totally going to sort the selects under config
PPC :/
cheers
next prev parent reply other threads:[~2017-01-30 4:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 2:46 linux-next: manual merge of the rcu tree with the powerpc-fixes tree Stephen Rothwell
2017-01-30 4:00 ` Michael Ellerman [this message]
2017-01-30 9:30 ` [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC Andrew Donnellan
2017-01-30 9:41 ` Stephen Rothwell
2017-01-30 9:56 ` Michael Ellerman
2017-01-30 10:21 ` Stephen Rothwell
2017-03-08 0:36 linux-next: manual merge of the rcu tree with the powerpc-fixes tree 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=87y3xtw62l.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).