From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gregory CLEMENT Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree Date: Fri, 23 May 2014 15:08:37 +0200 Message-ID: <537F4855.70201@free-electrons.com> References: <20140523104534.467b452b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from top.free-electrons.com ([176.31.233.9]:53823 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751386AbaEWNIr (ORCPT ); Fri, 23 May 2014 09:08:47 -0400 In-Reply-To: <20140523104534.467b452b@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Russell King Cc: Thomas Petazzoni , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Cooper Hi Stephen, On 23/05/2014 02:45, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-mvebu/board-v7.c between commit 8ae2473d96f1 ("ARM: l2c: > mvebu: convert to generic l2c OF initialisation") from the arm tree and > commit 5686a1e5aa43 ("bus: mvebu: pass the coherency availability > information at init time") from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > This fix seems to be the good thing to do. Thanks, Gregory > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com