From: Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
To: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Cc: Colin Cross <ccross-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>,
Linux Tegra Mailing List
<linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
"Ben Dooks (embedded platforms)"
<ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>,
Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Subject: Re: Move tegra in linux-next merge order
Date: Wed, 16 Mar 2011 22:15:22 +0000 [thread overview]
Message-ID: <20110316221522.GF15605@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20110317091048.98b63924.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
On Thu, Mar 17, 2011 at 09:10:48AM +1100, Stephen Rothwell wrote:
> The usual way to do that is for (in this case) the asoc tree to have a
> branch that contains the commits that the tegra tree depends on and for
> both trees to merge the branch. This is much better than (say)
> cherry-picking the commits into the tegra tree.
We'd need to cherry pick the commits into a branch to create the new
ASoC branch anyway, I can't rebase the tree as it's merged elsewhere.
The need to use the code in the Tegra tree wasn't flagged until too
late.
--
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-03-16 22:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-14 20:37 Move tegra in linux-next merge order Colin Cross
[not found] ` <AANLkTikoBGKh9DP1q3ujDBg1fH5Azkahy8RpSO=GqzOR-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-03-14 22:51 ` Olof Johansson
2011-03-16 22:10 ` Stephen Rothwell
[not found] ` <20110317091048.98b63924.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2011-03-16 22:15 ` Mark Brown [this message]
[not found] ` <20110316221522.GF15605-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2011-03-16 22:50 ` Stephen Rothwell
[not found] ` <20110317095016.e0fd4012.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2011-03-16 22:54 ` Mark Brown
[not found] ` <20110316225459.GG15605-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2011-03-16 22:58 ` Colin Cross
[not found] ` <AANLkTinfqA4rKk2z9Hjgd-j0FS12Mm2ktmhfPZfb-HKd-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-03-16 23:13 ` Stephen Rothwell
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=20110316221522.GF15605@opensource.wolfsonmicro.com \
--to=broonie-yzvpicuk2aatku/dhu1wvuem+bqzidxxqq4iyu8u01e@public.gmane.org \
--cc=ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org \
--cc=ccross-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
--cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.