Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1739494

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

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

Show all headers | View raw


Hi Paul,

On Mon, 25 Sep 2017 20:26:28 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> This conflict will disappear tomorrow, as I have merged the commit
> from Linus's tree in place of mine and have added another commit that 
> removes the READ_ONCE()s.  Same result, but no conflict.  ;-)

Thanks, I figured something like that would happen.
-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | NextPrevious 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