linux-kernel - Re: linux-next: manual merge of the sound-asoc tree with the regmap 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] [day] [month] [year] [list]

Message-ID: <20120510093650.GL3908@opensource.wolfsonmicro.com>
Date:	Thu, 10 May 2012 10:36:50 +0100
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Liam Girdwood <lrg@...com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Laxman Dewangan <ldewangan@...dia.com>,
	Stephen Warren <swarren@...dia.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the regmap
 tree

On Thu, May 10, 2012 at 07:05:54PM +1000, Stephen Rothwell wrote:
> On Thu, 10 May 2012 09:53:55 +0100 Mark Brown <broonie@...nsource.wolfsonmicro.com> wrote:

> > That's the right fix - it's already included in the regmap tree itself.

> Yeah, this conflict arises because there a set of patches in the
> sound-asoc tree that are also in the regmap tree.   They really should
> have been in a stable branch of the regmap tree that both trees could
> merge.

There is (if you look at the -next branch in regmap you can see it
getting merged), I just didn't merge it into ASoC since Linus was saying
he's going to do another -rc and he complains if you merge bugfixes
directly up into your development branches too much.

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)