public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
* linux-next: duplicate patches in the pci tree
@ 2024-05-14 22:31 Stephen Rothwell
  2024-05-14 22:58 ` Conor Dooley
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-05-14 22:31 UTC (permalink / raw)
  To: Bjorn Helgaas, Lorenzo Pieralisi, Krzysztof Wilczyński
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: duplicate patches in the pci tree
  2024-05-14 22:31 linux-next: duplicate patches in the pci tree Stephen Rothwell
@ 2024-05-14 22:58 ` Conor Dooley
  2024-05-14 23:27   ` Bjorn Helgaas
  0 siblings, 1 reply; 4+ messages in thread
From: Conor Dooley @ 2024-05-14 22:58 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, Lorenzo Pieralisi, Krzysztof Wilczyński,
	Linux Kernel Mailing List, Linux Next Mailing List

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

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



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: duplicate patches in the pci tree
  2024-05-14 22:58 ` Conor Dooley
@ 2024-05-14 23:27   ` Bjorn Helgaas
  2024-05-15 13:53     ` Krzysztof Wilczyński
  0 siblings, 1 reply; 4+ messages in thread
From: Bjorn Helgaas @ 2024-05-14 23:27 UTC (permalink / raw)
  To: Conor Dooley
  Cc: Stephen Rothwell, Bjorn Helgaas, Lorenzo Pieralisi,
	Krzysztof Wilczyński, Linux Kernel Mailing List,
	Linux Next Mailing List

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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: duplicate patches in the pci tree
  2024-05-14 23:27   ` Bjorn Helgaas
@ 2024-05-15 13:53     ` Krzysztof Wilczyński
  0 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Wilczyński @ 2024-05-15 13:53 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Conor Dooley, Stephen Rothwell, Bjorn Helgaas, Lorenzo Pieralisi,
	Linux Kernel Mailing List, Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-05-15 13:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-14 22:31 linux-next: duplicate patches in the pci tree Stephen Rothwell
2024-05-14 22:58 ` Conor Dooley
2024-05-14 23:27   ` Bjorn Helgaas
2024-05-15 13:53     ` Krzysztof Wilczyński

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox