On Friday 21 June 2013, Thomas Petazzoni wrote: > 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. Yes, good point. The alternative would be that Bjorn also takes the PCI branch dependencies that are already in arm-soc into his tree. Either way works, but I agree that what you suggest would be simpler. Arnd -- 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
