From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: linux-next: manual merge of the amlogic tree with the arm-soc tree Date: Wed, 18 Jan 2017 11:06:53 -0800 Message-ID: References: <20170118095531.37f33df0@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170118095531.37f33df0@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 18 Jan 2017 09:55:31 +1100") List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Stephen Rothwell Cc: Arnd Bergmann , Neil Armstrong , Martin Blumenstingl , linux-kernel@vger.kernel.org, Olof Johansson , linux-next@vger.kernel.org, Carlo Caione , ARM List-Id: linux-next.vger.kernel.org Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the amlogic tree got a conflict in: > > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > > between commit: > > f7bcd4b6f698 ("ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS") > > from the arm-soc tree and commit: > > 47961f1353b8 ("ARM64: dts: meson-gx: move the SCPI and SRAM nodes to meson-gx") > > from the amlogic tree. The latter has been dropped from the amlogic pending some ongoing discussion, but I forgot to push an updated for-next. That's remedied now. Kevin