On 03/15/2013 03:12 AM, Felipe Balbi wrote: > PHY layer no longer returns NULL, we must > switch from IS_ERR_OR_NULL() to IS_ERR(). This change will definitely conflict with some Tegra EHCI/USB-PHY changes that Venu plans to submit very soon, for 3.10. This is relevant since we'd previously discussed you ack'ing Venu's patches, and my applying them to the Tegra tree, due to dependencies between the Tegra device tree files and his USB changes. To resolve this, we can do the following: 1) I will create a tiny topic branch containing just the Tegra DT changes that must happen before the USB driver changes. This can be based on v3.9-rc1 or similar, and be entirely self-contained. 2) You can merge that topic branch into your USB tree, so that the changes are present there. 3) I will merge that topic branch into the Tegra tree. (2) and (3) are both needed so that the exact same commit ID is present in each of our branches. It's needed in yours as a pre-cursor to Venu's changes. It's needed in Tegra's because I still hope to activate usage of the C pre-processor on the Tegra DT files, and that needs to build on top of the same DT change of Venu's that you also need. 4) Once you've done that, you can take Venu's USB patches through your USB tree rather than my applying them to the Tegra tree. This will allow you to resolve any conflicts between your changes and Venu's changes entirely within your branch simply by applying the patches one after the other. Nice and simple, and just like any other USB change. However, this goes against your statement that you "don't accept pull requests". Perhaps you can make an exception for this case? -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
