Messages in this thread | | | Date | Tue, 26 Sep 2017 13:42:19 +1000 | From | Stephen Rothwell <> | Subject | Re: 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
| |