Dear Arnd Bergmann, On Fri, 21 Jun 2013 09:31:58 +0200, Arnd Bergmann wrote: > Bjorn, are you still considering to merge this for 3.11 or have you > closed your tree for the merge window? I think it would be good to get > it in. Note that the of/pci changes needed for this driver are merged through the arm-soc tree, with the of maintainers ACKs. They are already in arm-soc for-next, through Jason Cooper's tree. 4e23d3f505e8acfeac7cc33d4113fbb5a25c3090 of/pci: Add of_pci_parse_bus_range() function 45ab9702fb47d18dca116b3a0509efa19fbcb27a of/pci: Add of_pci_get_devfn() function 29b635c00f3ebcdaf7a52c4948f6d948ad3757d3 of/pci: Provide support for parsing PCI DT ranges property Also, it depends on the Marvell PCIe driver (but to a lesser extent), which is the one that creates the drivers/pci/host/Kconfig and drivers/pci/host/Makefile. 45361a4fe4464180815157654aabbd2afb4848ad pci: PCIe driver for Marvell Armada 370/XP systems I am by far not an expert on how to solve merge strategies and so on, but to avoid conflicts at Linus's level while merging the arm-soc and pci trees, it would be better if this Samsung PCIe driver could go through arm-soc (with Bjorn ACK, of course), so that Arnd/Olof can make sure the ordering is correct with regard to the of/pci changes and the mvebu/pci driver. I'll let you discuss that with Jason Cooper. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- 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
