linux-kernel - Re: linux-next: manual merge of the sound tree with the omap 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: <20091113131148.GC21516@rakim.wolfsonmicro.main>
Date:	Fri, 13 Nov 2009 13:11:48 +0000
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Takashi Iwai <tiwai@...e.de>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Ujfalusi <peter.ujfalusi@...ia.com>,
	vikram pandita <vikram.pandita@...com>,
	Tony Lindgren <tony@...mide.com>
Subject: Re: linux-next: manual merge of the sound tree with the omap tree

On Fri, Nov 13, 2009 at 02:06:44PM +0100, Takashi Iwai wrote:
> Mark Brown wrote:

> > into the OMAP tree to resolve this.  There's some older ASoC changes in
> > there to ensure the patches applied but I'm happy for you to carry those
> > providing Takashi is.

> I can merge the tree above to for-next branch of sound git tree, too.
> In that way, we can keep asoc branches clean.

I believe that creates the same problem both ways :/ .  If we merge
OMAP->sound we may as well put it on the ASoC topic branch, it'll
probably be helpful for people doing OMAP work 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/