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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/regmap/regmap.c
index bb80853,8a25006..0000000
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -775,11 -863,10 +863,12 @@@ int regmap_bulk_read(struct regmap *map
  			map->format.parse_val(val + i);
  	} else {
  		for (i = 0; i < val_count; i++) {
 +			unsigned int ival;
- 			ret = regmap_read(map, reg + i, &ival);
+ 			ret = regmap_read(map, reg + (i * map->reg_stride),
 -					  val + (i * val_bytes));
++					  &ival);
  			if (ret != 0)
  				return ret;
 +			memcpy(val + (i * val_bytes), &ival, val_bytes);
  		}
  	}
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Laxman Dewangan]

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.

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

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.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 864 bytes --]

On Thu, 10 May 2012 09:53:55 +0100 Mark Brown <broonie@opensource.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@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 720 bytes --]

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@opensource.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.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]