From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro•org>
Cc: Rob Herring <robherring2@gmail•com>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rob Herring <robh@kernel•org>
Subject: Re: linux-next: manual merge of the devicetree tree with the mmc tree
Date: Mon, 27 Feb 2023 10:02:03 +1100 [thread overview]
Message-ID: <20230227100203.74ced769@canb.auug.org.au> (raw)
In-Reply-To: <20230125112438.552917be@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]
Hi all,
On Wed, 25 Jan 2023 11:24:38 +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/mmc/nvidia,tegra20-sdhci.yaml
>
> between commit:
>
> 1e52a7e6794f ("dt-bindings: mmc: drop unneeded quotes")
>
> from the mmc tree and commit:
>
> 21fd06dc4a34 ("dt-bindings: drop type for operating-points-v2")
>
> from the devicetree tree.
>
> I fixed it up (the latter removed a line fixed up by 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.
This is now a conflict between the mmc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-02-26 23:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 0:24 linux-next: manual merge of the devicetree tree with the mmc tree Stephen Rothwell
2023-02-26 23:02 ` Stephen Rothwell [this message]
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=20230227100203.74ced769@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=krzysztof.kozlowski@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
--cc=ulf.hansson@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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