Stephen Warren <swarren@xxxxxxxxxxxxx> wrote @ Mon, 13 May 2013 18:46:27 +0200: > I'm not sure exactly how these patches will get merged. For you > reference, I anticipate one of two things happening: > > 1) > > * Patches 1, 3, 5 get put into a topic branch, and merged into both the > clk tree and the Tegra tree. > > * Patches 2, 4, 6 get merged into the Tegra tree. > > * The patches you're going to create for the drivers/clk code get merged > into Mike's clk tree > > 2) > > * Mike ack's the patches you're going to create for the drivers/clk code. > > * Everything gets merged through the Tegra tree. > > This shouldn't impact you much, but just be aware that the drivers/clk > changes you create shouldn't depend on anything beyond patches 1, 3, 5 > here and 3.10-rc1, then I can work out the merging with Mike without any > constraints. Either way would work. Once Venu's USB patches are merged, mentioned in [2/6], I'll resend the update version of this series. drivers/clk/tegra replacement will follow, then. -- 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
