Re: linux-next: manual merge of the irqchip tree with the sunxi tree

Stephen Rothwell
2021-02-14T22:12:19Z

[-- Attachment #1: Type: text/plain, Size: 2156 bytes --]

Hi all,

On Mon, 1 Feb 2021 14:42:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the irqchip tree got a conflict in:
>
> Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
>
> between commit:
>
> 752b0aac99c7 ("dt-bindings: irq: sun7i-nmi: Add binding documentation for the V3s NMI")
>
> from the sunxi tree and commit:
>
> ad6b47cdef76 ("dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi")
>
> from the irqchip tree.
>
> I fixed it up (I think - see below) 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.
>
> diff --cc Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
> index 4fd1e2780026,f34ecc8c7093..000000000000
> --- a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
> +++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
> @@@ -25,17 -25,7 +25,10 @@@ properties
> - const: allwinner,sun6i-a31-sc-nmi
> deprecated: true
> - const: allwinner,sun7i-a20-sc-nmi
> - - items:
> - - const: allwinner,sun8i-a83t-r-intc
> - - const: allwinner,sun6i-a31-r-intc
> + - items:
> + - const: allwinner,sun8i-v3s-nmi
> + - const: allwinner,sun9i-a80-nmi
> - const: allwinner,sun9i-a80-nmi
> - - items:
> - - const: allwinner,sun50i-a64-r-intc
> - - const: allwinner,sun6i-a31-r-intc
> - items:
> - const: allwinner,sun50i-a100-nmi
> - const: allwinner,sun9i-a80-nmi

With the merge window about to open, this is a reminder that this
conflict still exists. It is now between the arm-soc tree and the
irqchip tree.