From: Mark Brown <broonie@opensource•wolfsonmicro.com>
To: Kukjin Kim <kgene.kim@samsung•com>
Cc: 'Takashi Iwai' <tiwai@suse•de>,
'Stephen Rothwell' <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Jassi Brar' <jassi.brar@samsung•com>
Subject: Re: linux-next: manual merge of the sound tree with the s5p tree
Date: Thu, 23 Dec 2010 11:50:24 +0000 [thread overview]
Message-ID: <20101223115024.GA28928@sirena.org.uk> (raw)
In-Reply-To: <004001cba292$3827d2d0$a8777870$%kim@samsung.com>
On Thu, Dec 23, 2010 at 08:11:56PM +0900, Kukjin Kim wrote:
> Takashi Iwai wrote:
> > > Anyway I need above commits from sound-2.6.git in my tree...
> > > so how method is better to me instead of cherry-pick it?
> > You can merge topic/asoc branch of sound git tree.
> > This brach contains the all necessary commits for ASoC and is almost
> > never rebased.
> But I can't merge it because there is no 'topic/asoc' branch in
> sound-2.6.git.
> (git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git)
> Is there another repository?
topic/asoc is in Takashi's tree and is equivalent to my for-next branch,
it usually lags it by only a small amount. Takashi's tree is at:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
> And should I merge it in my tree even though don't need all of ASoC commits
> :-( ?
> I'm not sure how many commits are in there...
There's a lot of stuff in there but it shouldn't do any harm to
pre-merge (and we're almost at the merge window anyway).
next prev parent reply other threads:[~2010-12-23 11:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-23 0:53 linux-next: manual merge of the sound tree with the s5p tree Stephen Rothwell
2010-12-23 10:31 ` Kukjin Kim
2010-12-23 11:03 ` Takashi Iwai
2010-12-23 11:11 ` Kukjin Kim
2010-12-23 11:17 ` Takashi Iwai
2010-12-23 11:28 ` Kukjin Kim
2010-12-23 14:30 ` Takashi Iwai
2010-12-24 1:32 ` Kukjin Kim
2010-12-24 8:27 ` Russell King
2010-12-28 2:24 ` Kukjin Kim
2010-12-28 15:39 ` Mark Brown
2010-12-28 16:23 ` Russell King
2010-12-28 16:40 ` Mark Brown
2010-12-30 0:54 ` Kukjin Kim
2010-12-23 11:50 ` Mark Brown [this message]
2010-12-23 11:54 ` Piotr Hosowicz
2010-12-23 11:56 ` Mark Brown
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=20101223115024.GA28928@sirena.org.uk \
--to=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=jassi.brar@samsung$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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