* linux-next: manual merge of the devicetree tree with the mmc tree
@ 2023-01-25 0:24 Stephen Rothwell
2023-02-26 23:02 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2023-01-25 0:24 UTC (permalink / raw)
To: Rob Herring, Ulf Hansson
Cc: Krzysztof Kozlowski, Linux Kernel Mailing List,
Linux Next Mailing List, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the devicetree tree with the mmc tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2023-02-26 23:02 UTC (permalink / raw)
To: Ulf Hansson
Cc: Rob Herring, Krzysztof Kozlowski, Linux Kernel Mailing List,
Linux Next Mailing List, Rob Herring
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-26 23:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox