linux-next: manual merge of the rcu tree with Linus' tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the rcu tree with Linus' tree
Date	2017-09-26 05:10 +0200
Message-ID	<utOpY-7kB-17@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Paul,

Today's linux-next merge of the rcu tree got a conflict in:

  kernel/rcu/tree.c

between commit:

  28585a832602 ("rcu: Allow for page faults in NMI handlers")

from Linus' tree and commit:

  3e2baa988b9c ("rcu: Allow for page faults in NMI handlers")

from the rcu tree.

I fixed it up (I just used the rcu tree version) 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the rcu tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-09-26 05:10 +0200
  Re: linux-next: manual merge of the rcu tree with Linus' tree "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2017-09-26 05:30 +0200
    Re: linux-next: manual merge of the rcu tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-09-26 05:50 +0200

csiph-web