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 21:09:25 +0000 Message-ID: <20110222210925.GH31611@opensource.wolfsonmicro.com> References: <74CDBE0F657A3D45AFBB94109FB122FF03112A5AE2@HQMAIL01.nvidia.com> <20110222205210.GF31611@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Colin Cross Cc: Stephen Warren , Linux Tegra Mailing List , Erik Gilling , Olof Johansson List-Id: linux-tegra@vger.kernel.org On Tue, Feb 22, 2011 at 01:01:23PM -0800, Colin Cross wrote: > On Tue, Feb 22, 2011 at 12:52 PM, Mark Brown > > 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. I basically can't rebase my tree - it's merged into Takashi's tree and there's lots of cross dependencies with my 2.6.38 fixes branch which would cause bisect breakage. If you want to cherry pick the relevant WM8903 commit over into your tree that'd also be OK by me. -- 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