linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Masahiro Yamada <yamada.masahiro@socionext.com>,
	Neil Armstrong <narmstrong@baylibre.com>,
	Kevin Hilman <khilman@baylibre.com>
Subject: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Thu, 9 Nov 2017 13:26:32 +1100	[thread overview]
Message-ID: <20171109132632.480f1050@canb.auug.org.au> (raw)

Hi Rob,

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

  arch/arm64/boot/dts/amlogic/Makefile

between commit:

  593d311d9f17 ("ARM64: dts: meson-gxm: Add Vega S96 board")

from the arm-soc tree and commit:

  4408a86af32e ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in Makefile.lib")

from the devicetree tree.

I fixed it up (see below) 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

diff --cc arch/arm64/boot/dts/amlogic/Makefile
index b503e9b00cd3,4eb8f829472e..000000000000
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@@ -22,8 -19,3 +22,4 @@@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-n
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
 +dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
- 
- always		:= $(dtb-y)
- subdir-y	:= $(dts-dirs)
- clean-files	:= *.dtb

             reply	other threads:[~2017-11-09  2:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-09  2:26 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-22  6:03 linux-next: manual merge of the devicetree tree with the arm-soc tree Stephen Rothwell
2020-05-22  8:08 ` Arnd Bergmann
2019-11-14  2:21 Stephen Rothwell
2019-12-03  0:04 ` Stephen Rothwell
2017-11-09  2:21 Stephen Rothwell
2016-06-27  3:42 Stephen Rothwell
2014-03-12 22:03 Mark Brown
2014-03-12 22:36 ` Olof Johansson
2014-03-13 12:55   ` Grant Likely
2014-01-17  3:14 Stephen Rothwell
2014-01-17  3:11 Stephen Rothwell
2014-01-17  3:08 Stephen Rothwell
2014-01-17  4:35 ` Jason Cooper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171109132632.480f1050@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=khilman@baylibre.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=narmstrong@baylibre.com \
    --cc=olof@lixom.net \
    --cc=robherring2@gmail.com \
    --cc=yamada.masahiro@socionext.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).