Skip to contentSkip to conversation

linux-next: manual merge of the devicetree tree with the mmc tree

DISCUSSION Stephen Rothwell 1 participant 2 messages Jan 25, 2023 – Feb 26, 2023 Linux-next tree

lore
Share & tools
lore
#0 lore raw

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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw

Hi all,

Quoted 13 lines · On Wed, 25 Jan 2023 11:24:38 +1100 Stephen Rothwell <[email protected]>…

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")

Quoted 8 lines

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.

Signature · 2 lines
Cheers,
Stephen Rothwell