From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Re: Patches for 2.6.39 merge window Date: Tue, 22 Feb 2011 20:52:10 +0000 Message-ID: <20110222205210.GF31611@opensource.wolfsonmicro.com> References: <74CDBE0F657A3D45AFBB94109FB122FF03112A5AE2@HQMAIL01.nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <74CDBE0F657A3D45AFBB94109FB122FF03112A5AE2-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Stephen Warren Cc: Colin Cross , Linux Tegra Mailing List , Erik Gilling , Olof Johansson List-Id: linux-tegra@vger.kernel.org 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. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html