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] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 10 May 2012 19:05:54 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
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, 10 May 2012 09:53:55 +0100 Mark Brown <broonie@...nsource.wolfsonmicro.com> wrote:
>
> On Thu, May 10, 2012 at 02:25:52PM +1000, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the sound-asoc tree got a conflict in
> > drivers/base/regmap/regmap.c between commit 6560ffd1ccd6 ("regmap: fix
> > possible memory corruption in regmap_bulk_read()") from the regmap tree
> > and commit edc9ae420f98 ("regmap: implement register striding") from the
> > sound-asoc tree.
> 
> 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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped