Re: linux-next: manual merge of the sound-asoc tree with the regmaptree

From: Laxman Dewangan
Date: Thu May 10 2012 - 00:46:15 EST

On Thursday 10 May 2012 09:55 AM, Stephen Rothwell wrote:
* PGP Signed by an unknown key

Hi all,

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.

I fixed it up (see below) and can carry the fix as necessary.
The change looks fine to me.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at