On Fri, Oct 11, 2013 at 01:55:04PM +0200, Marek Vasut wrote: > > It is because driver part was merged into PCI tree by Bjorn Helgaas,[1] > > and arch part was merged into i.MX tree by Shawn Guo.[2] > > Thus, your patch can make the conflict issue. > > > > For example, > > [PATCH 1/2] ARM: dts: imx6qdl: Fix the clock for PCIe > > [PATCH 2/2] PCI: imx6: Fix the clock for PCIe > > > > Then, 1st patch can be merged to i.MX tree, and 2nd patch can be merged > > to PCI tree. > > > > If I am wrong, please let me know kindly. :-) > > By all means, you're right. Is the patch addressing the issue correctly (if we > ignore that it's not split)? Shawn? I need to first understand if you are seeing the issue with the latest linux-next like next-20131010. Note, linux-next tree goes to git://gitorious.org/thierryreding/linux-next [1] these days. Shawn [1] https://lkml.org/lkml/2013/9/30/179 -- 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
