On Wed, May 29, 2024 at 11:00:49AM -0400, Frank Li wrote: > On Tue, May 28, 2024 at 05:31:36PM -0500, Bjorn Helgaas wrote: > > On Tue, May 28, 2024 at 03:39:13PM -0400, Frank Li wrote: > ... > > > Base on linux-pci/controller/imx > > > > This applies cleanly to the pci/controller/gpio branch, which has some > > minor rework in pci-imx6.c. > > > > When we apply this, I think we should do it on a a pci/controller/imx6 > > branch that is based on "main" (v6.10-rc1). > > > > I can resolve the conflicts with pci/controller/gpio when building > > pci/next. > > Sorry, I forget update this. It should be base on linux-pci/next > (e3fca37312892122d73f8c5293c0d1cc8c34500b). I prefer patches that are based on -rc1, i.e., the pci/main branch, not on the pci/next branch. If a series *requires* functionality that is already on a topic branch, you can base it on that branch instead of on pci/main. This series happens to touch some of the same code as pci/controller/gpio, but it doesn't require those gpio changes, so it does not need to be based on pci/controller/gpio. Having this series based on pci/main means that if we update or drop the gpio branch for some reason, this series will still make sense. Bjorn
