2024-05-14 22:40:12

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patches in the pci tree

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

8b77e887b96c ("dt-bindings: gpio: mpfs: Add coreGPIO support")
8c24b6f1709f ("dt-bindings: gpio: mpfs: Allow gpio-line-names")

These are commits

6e12a52c1459 ("dt-bindings: gpio: mpfs: add coreGPIO support")
f752a52d34cb ("dt-bindings: gpio: mpfs: allow gpio-line-names")

in Linus' tree.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2024-05-14 22:58:50

by Conor Dooley

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the pci tree

On Wed, May 15, 2024 at 08:31:45AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
>
> 8b77e887b96c ("dt-bindings: gpio: mpfs: Add coreGPIO support")
> 8c24b6f1709f ("dt-bindings: gpio: mpfs: Allow gpio-line-names")

Neither of these, nor commit ff26bed00278 ("dt-bindings: riscv:
microchip: Document beaglev-fire") should be in the PCI tree really.

ff26bed00278 ("dt-bindings: riscv: microchip: Document beaglev-fire")
I don't mind if the PCI tree takes though, I didn't apply it for this
cycle so there shouldn't be a clash there.

Cheers,
Conor.

>
> These are commits
>
> 6e12a52c1459 ("dt-bindings: gpio: mpfs: add coreGPIO support")
> f752a52d34cb ("dt-bindings: gpio: mpfs: allow gpio-line-names")
>
> in Linus' tree.
>
> --
> Cheers,
> Stephen Rothwell



Attachments:
(No filename) (910.00 B)
signature.asc (235.00 B)
Download all attachments

2024-05-14 23:27:58

by Bjorn Helgaas

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the pci tree

On Tue, May 14, 2024 at 11:58:38PM +0100, Conor Dooley wrote:
> On Wed, May 15, 2024 at 08:31:45AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > The following commits are also in Linus Torvalds' tree as different
> > commits (but the same patches):
> >
> > 8b77e887b96c ("dt-bindings: gpio: mpfs: Add coreGPIO support")
> > 8c24b6f1709f ("dt-bindings: gpio: mpfs: Allow gpio-line-names")
>
> Neither of these, nor commit ff26bed00278 ("dt-bindings: riscv:
> microchip: Document beaglev-fire") should be in the PCI tree really.
>
> ff26bed00278 ("dt-bindings: riscv: microchip: Document beaglev-fire")
> I don't mind if the PCI tree takes though, I didn't apply it for this
> cycle so there shouldn't be a clash there.

Hmmm, yeah. I think we should drop these from the PCI tree:

ff26bed00278 ("dt-bindings: riscv: microchip: Document beaglev-fire")
8b77e887b96c ("dt-bindings: gpio: mpfs: Add coreGPIO support")
8c24b6f1709f ("dt-bindings: gpio: mpfs: Allow gpio-line-names")

There's no obvious PCI connection for any of those.

Krzysztof, can you drop them from pci/dt-bindings?

> > These are commits
> >
> > 6e12a52c1459 ("dt-bindings: gpio: mpfs: add coreGPIO support")
> > f752a52d34cb ("dt-bindings: gpio: mpfs: allow gpio-line-names")
> >
> > in Linus' tree.

2024-05-15 13:53:43

by Krzysztof Wilczyński

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the pci tree

Hello,

> > > The following commits are also in Linus Torvalds' tree as different
> > > commits (but the same patches):
> > >
> > > 8b77e887b96c ("dt-bindings: gpio: mpfs: Add coreGPIO support")
> > > 8c24b6f1709f ("dt-bindings: gpio: mpfs: Allow gpio-line-names")
> >
> > Neither of these, nor commit ff26bed00278 ("dt-bindings: riscv:
> > microchip: Document beaglev-fire") should be in the PCI tree really.
> >
> > ff26bed00278 ("dt-bindings: riscv: microchip: Document beaglev-fire")
> > I don't mind if the PCI tree takes though, I didn't apply it for this
> > cycle so there shouldn't be a clash there.
>
> Hmmm, yeah. I think we should drop these from the PCI tree:
>
> ff26bed00278 ("dt-bindings: riscv: microchip: Document beaglev-fire")
> 8b77e887b96c ("dt-bindings: gpio: mpfs: Add coreGPIO support")
> 8c24b6f1709f ("dt-bindings: gpio: mpfs: Allow gpio-line-names")
>
> There's no obvious PCI connection for any of those.
>
> Krzysztof, can you drop them from pci/dt-bindings?

Done.

With some of the DT patches, I am not always sure who will be taking them,
and so to err on the side of making sure that things are included, I will
pick some of these up.

Krzysztof