linux-kernel - Re: linux-next: duplicate patches in the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Tue, 14 May 2024 18:27:46 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: Conor Dooley <conor@...nel.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Lorenzo Pieralisi <lpieralisi@...nel.org>,
	Krzysztof Wilczyński <kw@...ux.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
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.