linux-kernel - Re: linux-next: manual merge of the sound tree with the s5p tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20101223115024.GA28928@sirena.org.uk>
Date:	Thu, 23 Dec 2010 11:50:24 +0000
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	'Takashi Iwai' <tiwai@...e.de>,
	'Stephen Rothwell' <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'Jassi Brar' <jassi.brar@...sung.com>
Subject: Re: linux-next: manual merge of the sound tree with the s5p tree

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).
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/