On Thu, 10 May 2012 09:53:55 +0100 Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
Attachment:
pgpq1oqqglJML.pgp
Description: PGP signature
