On Tue, Feb 22, 2011 at 12:52 PM, Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: > On Tue, Feb 22, 2011 at 12:48:46PM -0800, Stephen Warren wrote: > >> Should we handle it like this: Check in all the platform data to Tegra >> for-next, but with that one new field removed or commented out. Wait until >> the merge window is open for 2.6.39 (or 2.6.39-rc1 is released), and hence >> Tegra for-next/for-linus can merge from Linus' tree to pick up the new >> wm8903.h, then add or uncomment that one field in the platform data? > > That's the standard way of handling this sort of thing - just send the > patch in a second pull request once the dependencies have all landed. > You could also put it in the tegra-arch branch and we could both re-merge it. -- 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
