From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751651AbbHEElp (ORCPT <rfc822;w@1wt.eu>);
	Wed, 5 Aug 2015 00:41:45 -0400
Received: from ozlabs.org ([103.22.144.67]:48856 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751190AbbHEEln (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 5 Aug 2015 00:41:43 -0400
Date: Wed, 5 Aug 2015 14:41:39 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Borntraeger <borntraeger@de.ibm.com>,
        Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Andrey Konovalov <andreyknvl@google.com>,
        Ingo Molnar <mingo@kernel.org>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        Will Deacon <will.deacon@arm.com>
Subject: linux-next: manual merge of the access_once tree with the arm64
 tree
Message-ID: <20150805144139.575dbda7@canb.auug.org.au>
X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Christian,

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

  arch/arm64/include/asm/barrier.h

between commit:

  4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")

from the arm64 tree and commit:

  76695af20c01 ("locking, arch: use WRITE_ONCE()/READ_ONCE() in smp_store_release()/smp_load_acquire()")

from the access_once tree.

I fixed it up (the former removed the code modified by the latter, so I
just did that) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au