From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>,
mingo@kernel.org
Subject: Re: linux-next: manual merge of the rcu tree with the crypto tree
Date: Mon, 10 Dec 2018 11:29:30 -0800 [thread overview]
Message-ID: <20181210192930.GZ4170@linux.ibm.com> (raw)
In-Reply-To: <20181210154744.3b35b1c7@canb.auug.org.au>
On Mon, Dec 10, 2018 at 03:47:44PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> c97e4df573f2 ("MAINTAINERS: change NX/VMX maintainers")
>
> from the crypto tree and commit:
>
> 1dfddcdb95c4 ("MAINTAINERS: Update from @linux.vnet.ibm.com to @linux.ibm.com")
>
> from the rcu tree.
>
> I fixed it up (I used the crypto tree version of teh changes) 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.
Agreed, and again adding Ingo.
The author of the conflicting commit is on CC of my commit, FYI.
Thanx, Paul
prev parent reply other threads:[~2018-12-10 19:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 4:47 linux-next: manual merge of the rcu tree with the crypto tree Stephen Rothwell
2018-12-10 5:10 ` Stephen Rothwell
2018-12-10 19:29 ` Paul E. McKenney [this message]
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=20181210192930.GZ4170@linux.ibm.com \
--to=paulmck@linux.ibm.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pfsmorigo@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).