From: Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
To: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Cc: Colin Cross <ccross-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
Linux Tegra Mailing List
<linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Erik Gilling <konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org>,
Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
Subject: Re: Patches for 2.6.39 merge window
Date: Tue, 22 Feb 2011 20:52:10 +0000 [thread overview]
Message-ID: <20110222205210.GF31611@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <74CDBE0F657A3D45AFBB94109FB122FF03112A5AE2-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.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
next prev parent reply other threads:[~2011-02-22 20:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-22 20:17 Patches for 2.6.39 merge window Colin Cross
[not found] ` <AANLkTinK4oCbvDNPDFUjpB8qTBZiWfx3CkUuyuTLyVsx-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-22 20:48 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF03112A5AE2-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-02-22 20:52 ` Mark Brown [this message]
[not found] ` <20110222205210.GF31611-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2011-02-22 21:01 ` Colin Cross
[not found] ` <AANLkTi=Er0pL-KcSqw1WwKy+CZeM9SWjmOkp08YkhKmQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-22 21:09 ` Mark Brown
[not found] ` <20110222210925.GH31611-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2011-03-03 19:12 ` Colin Cross
[not found] ` <AANLkTi=HBjhdSY_7nfeqFZ6Cd_pJA6VBRTaOjmpA3jaw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-03-03 19:29 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF045687B480-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-03-03 21:37 ` Colin Cross
[not found] ` <AANLkTikMmoBT3ZG2UPNretXDK+UqMyk6X2GEpwMt5SC8-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-03-03 22:25 ` Colin Cross
[not found] ` <AANLkTinSQuFk9-NeA+F-35QitHO8KU4H_tffTneG8gxH-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-03-03 22:40 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF045687B50A-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-03-03 23:47 ` Colin Cross
[not found] ` <AANLkTi=ASu7++j+qu_JDtjha5_b3=2jZE8rAf=HLKBuS-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-03-04 1:00 ` Olof Johansson
[not found] ` <AANLkTinr=ye2CtcG9FmFZZ1sK3ZYp8woUeZ_GzYNnQn2-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-03-04 21:32 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF045687B727-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-03-05 0:11 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110222205210.GF31611@opensource.wolfsonmicro.com \
--to=broonie-yzvpicuk2aatku/dhu1wvuem+bqzidxxqq4iyu8u01e@public.gmane.org \
--cc=ccross-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
--cc=swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox