linux-next: manual merge of the rcu tree with the crypto tree

linux-next: manual merge of the rcu tree with the crypto tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the rcu tree with the crypto tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

Hi all,

On Mon, 10 Dec 2018 15:47:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (I used the crypto tree version of the changes) and can

This turned out to be the correct thing to do since my email to Paulo
Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com> (when forwarded to <pfsmorigo@linux.ibm.com>) bounced.   ;-)
 

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the rcu tree with the crypto tree

[Paul E. McKenney]

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