Hi all,
Today's linux-next merge of the mfd tree got a conflict in:
Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
between commit:
e465ea5cc05d ("dt-bindings: soc: samsung: usi: refer to dtschema for children")
from the arm-soc tree and commit:
0ff4827ed66f ("spi: dt-bindings: samsung: Convert to dtschema")
from the mfd tree.
I fixed it up (I just used the former version) 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
On 09/03/2022 03:29, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
>
> between commit:
>
> e465ea5cc05d ("dt-bindings: soc: samsung: usi: refer to dtschema for children")
>
> from the arm-soc tree and commit:
>
> 0ff4827ed66f ("spi: dt-bindings: samsung: Convert to dtschema")
>
> from the mfd tree.
>
> I fixed it up (I just used the former version) and can carry the fix as
> necessary.
Hi Arnd, Lee and Olof,
This conflict will pop-up when sending to Linus. I propose to resolve it
slightly different - just remove the conflicting lines. After merge
window I will properly reference the other schema inside properties (not
description). This can look like:
################
--- a/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
+++ b/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
@@ -17,13 +17,6 @@ description: |
child nodes, each representing a serial sub-node device. The mode setting
selects which particular function will be used.
- Refer to next bindings documentation for information on protocol subnodes that
- can exist under USI node:
-
- [1] Documentation/devicetree/bindings/serial/samsung_uart.yaml
- [2] Documentation/devicetree/bindings/i2c/i2c-exynos5.txt
- [3] Documentation/devicetree/bindings/spi/samsung,spi.yaml
-
properties:
$nodename:
pattern: "^usi@[0-9a-f]+$"
################
Best regards,
Krzysztof
Hi all,
On Wed, 9 Mar 2022 13:29:52 +1100 Stephen Rothwell <[email protected]> wrote:
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
>
> between commit:
>
> e465ea5cc05d ("dt-bindings: soc: samsung: usi: refer to dtschema for children")
>
> from the arm-soc tree and commit:
>
> 0ff4827ed66f ("spi: dt-bindings: samsung: Convert to dtschema")
>
> from the mfd tree.
>
> I fixed it up (I just used the former version) 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 arm-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell