Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751878AbbFZFwZ (ORCPT ); Fri, 26 Jun 2015 01:52:25 -0400 Received: from smtprelay.synopsys.com ([198.182.60.111]:49714 "EHLO smtprelay.synopsys.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751277AbbFZFwS (ORCPT ); Fri, 26 Jun 2015 01:52:18 -0400 Message-ID: <558CE86E.8040006@synopsys.com> Date: Fri, 26 Jun 2015 11:21:42 +0530 From: Vineet Gupta User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 Newsgroups: gmane.linux.kernel,gmane.linux.kernel.next To: Stephen Rothwell CC: , , "Peter Zijlstra" , Ingo Molnar Subject: Re: linux-next: manual merge of the arc tree with Linus' tree References: <20150626094751.3c5a6490@canb.auug.org.au> In-Reply-To: <20150626094751.3c5a6490@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.12.197.226] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 828 Lines: 33 On Friday 26 June 2015 05:17 AM, Stephen Rothwell wrote: > Hi Vineet, > > Today's linux-next merge of the arc tree got a conflict in: > > include/asm-generic/barrier.h > > between commits: > > ab3f02fc2372 ("locking/arch: Add WRITE_ONCE() to set_mb()") > b92b8b35a2e3 ("locking/arch: Rename set_mb() to smp_store_mb()") > > from Linus' tree and commit: > > 470c27e4695a ("arch: conditionally define smp_{mb,rmb,wmb}") > > from the arc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > LGTM. Thx Stephan. -Vineet -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/