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

2018-12-10 Thread 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: > >

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

2018-12-09 Thread Stephen Rothwell
Hi all, On Mon, 10 Dec 2018 15:47:44 +1100 Stephen Rothwell 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 (when forwarded to ) bounced. ;-) -- Cheers, Stephen

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

2018-12-09 Thread Stephen Rothwell
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.