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>,
Robin Murphy <robin.murphy@arm.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Marian Mihailescu <mihailescu2m@gmail.com>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Tue, 3 Dec 2019 11:04:00 +1100 [thread overview]
Message-ID: <20191203110400.1b6b279b@canb.auug.org.au> (raw)
In-Reply-To: <20191114132131.56089c64@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2220 bytes --]
Hi all,
This is now a conflict between the arm-soc tree and Linus' tree.
On Thu, 14 Nov 2019 13:21:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
>
> between commit:
>
> 577dd5de0990 ("arm64: dts: juno: add GPU subsystem")
>
> from the arm-soc tree and commit:
>
> 3afd6389f320 ("dt-bindings: gpu: mali-midgard: add samsung exynos 5420 compatible")
>
> 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 Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
> index 018f3ae4b43c,c9bdf1074305..000000000000
> --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
> +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
> @@@ -21,11 -29,8 +29,12 @@@ properties
> - items:
> - enum:
> - amlogic,meson-gxm-mali
> + - realtek,rtd1295-mali
> - const: arm,mali-t820
> + - items:
> + - enum:
> + - arm,juno-mali
> + - const: arm,mali-t624
> - items:
> - enum:
> - rockchip,rk3288-mali
> @@@ -34,16 -40,8 +44,7 @@@
> - enum:
> - rockchip,rk3399-mali
> - const: arm,mali-t860
> - - items:
> - - enum:
> - - samsung,exynos5250-mali
> - - const: arm,mali-t604
> - - items:
> - - enum:
> - - samsung,exynos5433-mali
> - - const: arm,mali-t760
>
> - # "arm,mali-t628"
> - # "arm,mali-t624"
> # "arm,mali-t830"
> # "arm,mali-t880"
>
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-12-03 0:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 2:21 linux-next: manual merge of the devicetree tree with the arm-soc tree Stephen Rothwell
2019-12-03 0:04 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-22 6:03 Stephen Rothwell
2020-05-22 8:08 ` Arnd Bergmann
2017-11-09 2:26 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=20191203110400.1b6b279b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mihailescu2m@gmail.com \
--cc=olof@lixom.net \
--cc=robherring2@gmail.com \
--cc=robin.murphy@arm.com \
--cc=sudeep.holla@arm.com \
--cc=torvalds@linux-foundation.org \
/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).