Received-SPF: pass (google.com: domain of linux-kernel+bounces-179259-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Tue, 14 May 2024 18:27:46 -0500
From: Bjorn Helgaas <helgaas@kernel.org>
To: Conor Dooley <conor@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lpieralisi@kernel.org>,
	Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= <kw@linux.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the pci tree
Message-ID: <20240514232746.GA2089475@bhelgaas>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240514-nerd-acclaim-04cf23e62926@spud>

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.