From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967611AbdIZDmW (ORCPT ); Mon, 25 Sep 2017 23:42:22 -0400 Received: from ozlabs.org ([103.22.144.67]:55237 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966548AbdIZDmV (ORCPT ); Mon, 25 Sep 2017 23:42:21 -0400 Date: Tue, 26 Sep 2017 13:42:19 +1000 From: Stephen Rothwell To: "Paul E. McKenney" Cc: Linux-Next Mailing List , Linux Kernel Mailing List , "Steven Rostedt (VMware)" Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree Message-ID: <20170926134219.02b65fca@canb.auug.org.au> In-Reply-To: <20170926032628.GT3521@linux.vnet.ibm.com> References: <20170926130018.421ed780@canb.auug.org.au> <20170926032628.GT3521@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Paul, On Mon, 25 Sep 2017 20:26:28 -0700 "Paul E. McKenney" 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