* Re: linux-next: manual merge of the irqchip tree with the sunxi tree [not found] <20210201144259.102ae6ab@canb.auug.org.au> @ 2021-02-14 22:11 ` Stephen Rothwell 2021-02-18 4:48 ` Stephen Rothwell 0 siblings, 1 reply; 3+ messages in thread From: Stephen Rothwell @ 2021-02-14 22:11 UTC (permalink / raw) To: Marc Zyngier, Olof Johansson, Arnd Bergmann, ARM Cc: Samuel Holland, Paul Kocialkowski, Maxime Ripard, Linux Kernel Mailing List, Chen-Yu Tsai, Linux Next Mailing List, Maxime Ripard [-- Attachment #1.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. -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the irqchip tree with the sunxi tree 2021-02-14 22:11 ` linux-next: manual merge of the irqchip tree with the sunxi tree Stephen Rothwell @ 2021-02-18 4:48 ` Stephen Rothwell 2021-02-26 10:22 ` Paul Kocialkowski 0 siblings, 1 reply; 3+ messages in thread From: Stephen Rothwell @ 2021-02-18 4:48 UTC (permalink / raw) To: Olof Johansson, Arnd Bergmann, ARM, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra Cc: Samuel Holland, Marc Zyngier, Linux Kernel Mailing List, Maxime Ripard, Paul Kocialkowski, Chen-Yu Tsai, Linux Next Mailing List, Maxime Ripard [-- Attachment #1.1: Type: text/plain, Size: 2409 bytes --] 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. -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the irqchip tree with the sunxi tree 2021-02-18 4:48 ` Stephen Rothwell @ 2021-02-26 10:22 ` Paul Kocialkowski 0 siblings, 0 replies; 3+ messages in thread From: Paul Kocialkowski @ 2021-02-26 10:22 UTC (permalink / raw) To: Stephen Rothwell Cc: Arnd Bergmann, Samuel Holland, Peter Zijlstra, Marc Zyngier, Linux Kernel Mailing List, Maxime Ripard, Chen-Yu Tsai, Linux Next Mailing List, Maxime Ripard, H. Peter Anvin, Olof Johansson, Thomas Gleixner, Ingo Molnar, ARM 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/ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-26 10:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210201144259.102ae6ab@canb.auug.org.au>
2021-02-14 22:11 ` linux-next: manual merge of the irqchip tree with the sunxi tree Stephen Rothwell
2021-02-18 4:48 ` Stephen Rothwell
2021-02-26 10:22 ` Paul Kocialkowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox