From: Krzysztof Kozlowski <krzk@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Rob Herring <robh@kernel.org>
Cc: Rob Herring <robherring2@gmail.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Guillaume Gardet <guillaume.gardet@arm.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the samsung-krzk tree
Date: Tue, 3 Sep 2019 08:32:32 +0200 [thread overview]
Message-ID: <CAJKOXPfokg493On43AJkx=YWz-6Tee8_G+Mha9cnLVeBvyb9mQ@mail.gmail.com> (raw)
In-Reply-To: <20190903153718.14b7a5e7@canb.auug.org.au>
On Tue, 3 Sep 2019 at 07:37, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
>
> between commit:
>
> 5833f5a5daf3 ("dt-bindings: gpu: mali: Add Samsung exynos5250 compatible")
>
> from the samsung-krzk tree and commit:
>
> 553cedf60056 ("dt-bindings: Convert Arm Mali Midgard GPU to DT schema")
>
> from the devicetree tree.
>
> I fixed it up (I just removed the txt file, some fixup will be requide for
> the new yaml file) and can carry the fix as necessary. This is now fixed
Thanks Stephen.
Rob,
The conflict is non trivial. I could drop the patch, so Guillaume
could rebase his patch on top of next and send it again for inclusion
through your tree. Any other ideas?
The patch itself:
https://patchwork.kernel.org/patch/11123729/
Best regards,
Krzysztof
next prev parent reply other threads:[~2019-09-03 6:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 5:37 linux-next: manual merge of the devicetree tree with the samsung-krzk tree Stephen Rothwell
2019-09-03 6:32 ` Krzysztof Kozlowski [this message]
2019-09-03 6:45 ` Rob Herring
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='CAJKOXPfokg493On43AJkx=YWz-6Tee8_G+Mha9cnLVeBvyb9mQ@mail.gmail.com' \
--to=krzk@kernel.org \
--cc=guillaume.gardet@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=robherring2@gmail.com \
--cc=sfr@canb.auug.org.au \
/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).