Bjorn, Sorry for the delayed response. Apparently, work doesn't stop when you go out of town for a week. :-) On Wed, Oct 30, 2013 at 10:06:58AM -0600, Bjorn Helgaas wrote: > On Tue, Oct 29, 2013 at 4:12 PM, Bjorn Helgaas <bhelgaas@xxxxxxxxxx> wrote: > > [+cc Jason] > > > > On Mon, Oct 21, 2013 at 3:06 AM, Sachin Kamat <sachin.kamat@xxxxxxxxxx> wrote: > >> mvebu_pcie_of_match_table is always compiled in. Hence of_match_ptr is > >> not required. > >> > >> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx> > >> Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx> > > > > Jason, I assume you'll merge this if you want it. Hmm, we seem to be at a good transition point. The arm-soc tree tries not to take any more patches after -rc6, so we've been frozen since then. I have a few pci patches in my mvebu-next/drivers branch that didn't make it in in time. Jason Gunthorpe has a hotplug patch that needs testing and a few other fixes floating around. Perhaps we should just go ahead and transition back to the mvebu maintainers Ack'ing patches and then going through your tree (as it's supposed to be)? If we run into another complicated dependency mess, we'll hash it out then. atm, I don't see anything on the horizon. Sound good? If so, I'll drop the following from mvebu-next/drivers: ca02ce7f863f PCI: mvebu - The bridge secondary status register should be 0 b09d7cdf75dc PCI: mvebu - Support a bridge with no IO port window dbbe1efd61e3 PCI: mvebu: return NULL instead of ERR_PTR(ret) You can take them for v3.13 if you'd like, or hold them for v3.14 (which was the current plan due to the -rc6 cutoff). I've intentionally kept mvebu-next/* branches out of linux-next, so cherry picking the above shouldn't cause any conflicts. thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
