linux-next: manual merge of the amlogic tree with the arm-soc tree

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the amlogic tree with the arm-soc tree
Date	Wed, 18 Jan 2017 00:00:02 +0100
Message-ID	<t0KTo-4vR-1@gated-at.bofh.it> (permalink)
X-Original-To	Kevin Hilman <khilman@baylibre.com>, Carlo Caione <carlo@caione.org>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, ARM <linux-arm-kernel@lists.infradead.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1484693732; bh=8WeCFqkpXdAAQpISOG4cXFUm16zuUowEFBuOozyIn4s=; h=Date:From:To:Cc:Subject:From; b=UuL9A+jdCOrzM8S0J82DyyjVowCPNaLrgGr7mIl3bJun1jB5ohMrWHKuoyu2WDa5f O5gj/hkbH7Ko3iMHVzRGmgotROJS04LjeNLKW6ecXeMuSU8hhinwgXt9bHNgldiHmp 8zRkLgvVzeBWjU9Gloak+VVqVIKnniJ4hRJyg4CY=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	27
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong <narmstrong@baylibre.com>, Martin Blumenstingl <martin.blumenstingl@googlemail.com>
X-Original-Date	Wed, 18 Jan 2017 09:55:31 +1100
X-Original-Message-ID	<20170118095531.37f33df0@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1561072

Show key headers only | View raw

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.

I fixed it up (the latter moved the code modified by the former into
another file, but also incorporated the change from the former) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the amlogic tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-18 00:00 +0100
  Re: linux-next: manual merge of the amlogic tree with the arm-soc tree Kevin Hilman <khilman@baylibre.com> - 2017-01-18 20:20 +0100

csiph-web