linux-kernel - Re: linux-next: manual merge of the mfd tree with the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 9 Mar 2022 10:18:51 +0100
From:   Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>
To:     Lee Jones <lee.jones@...aro.org>, Olof Johansson <olof@...om.net>,
        Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Krzysztof Kozlowski <krzk@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: linux-next: manual merge of the mfd tree with the arm-soc tree


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