Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 26 Feb 2021 11:22:15 +0100
From:   Paul Kocialkowski <contact@paulk.fr>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Marc Zyngier <maz@kernel.org>,
        Maxime Ripard <mripard@kernel.org>,
        Chen-Yu Tsai <wens@csie.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Maxime Ripard <maxime@cerno.tech>,
        Samuel Holland <samuel@sholland.org>
Subject: Re: linux-next: manual merge of the irqchip tree with the sunxi tree
Message-ID: <YDjL1zcCNDlFVKbj@aptenodytes>
References: <20210201144259.102ae6ab@canb.auug.org.au>
 <20210215091124.46c005ad@canb.auug.org.au>
 <20210218154857.75bad5df@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8BIT
In-Reply-To: <20210218154857.75bad5df@canb.auug.org.au>
Precedence: bulk

Hi,

On Thu 18 Feb 21, 15:48, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 15 Feb 2021 09:11:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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.
> 
> This is now a conflict between the arm-soc tree and the tip tree.

The resolution looks correct to me!

Cheers,

Paul

-- 
Developer of free digital technology and hardware support.

Website: https://www.paulk.fr/
Coding blog: https://code.paulk.fr/
Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/