lkml.org 
[lkml]   [2017]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the rcu tree with Linus' tree
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

\
 
 \ /
  Last update: 2017-09-26 05:44    [W:0.064 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site