From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@linux•vnet.ibm.com>,
Herbert Xu <herbert@gondor•apana.org.au>
Cc: 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>
Subject: linux-next: manual merge of the rcu tree with the crypto tree
Date: Mon, 10 Dec 2018 15:47:44 +1100 [thread overview]
Message-ID: <20181210154744.3b35b1c7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 759 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-12-10 4:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 4:47 Stephen Rothwell [this message]
2018-12-10 5:10 ` linux-next: manual merge of the rcu tree with the crypto tree Stephen Rothwell
2018-12-10 19:29 ` Paul E. McKenney
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=20181210154744.3b35b1c7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@linux$(echo .)vnet.ibm.com \
--cc=pfsmorigo@linux$(echo .)vnet.ibm.com \
/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