* linux-next: manual merge of the sound-asoc tree with the regmap tree
@ 2012-05-10 4:25 Stephen Rothwell
2012-05-10 4:42 ` Laxman Dewangan
2012-05-10 8:53 ` Mark Brown
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2012-05-10 4:25 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Laxman Dewangan, Stephen Warren
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the sound-asoc tree with the regmap tree
2012-05-10 4:25 linux-next: manual merge of the sound-asoc tree with the regmap tree Stephen Rothwell
@ 2012-05-10 4:42 ` Laxman Dewangan
2012-05-10 8:53 ` Mark Brown
1 sibling, 0 replies; 5+ messages in thread
From: Laxman Dewangan @ 2012-05-10 4:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Stephen Warren
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.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the sound-asoc tree with the regmap tree
2012-05-10 4:25 linux-next: manual merge of the sound-asoc tree with the regmap tree Stephen Rothwell
2012-05-10 4:42 ` Laxman Dewangan
@ 2012-05-10 8:53 ` Mark Brown
2012-05-10 9:05 ` Stephen Rothwell
1 sibling, 1 reply; 5+ messages in thread
From: Mark Brown @ 2012-05-10 8:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Liam Girdwood, linux-next, linux-kernel, Laxman Dewangan,
Stephen Warren
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the sound-asoc tree with the regmap tree
2012-05-10 8:53 ` Mark Brown
@ 2012-05-10 9:05 ` Stephen Rothwell
2012-05-10 9:36 ` Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2012-05-10 9:05 UTC (permalink / raw)
To: Mark Brown
Cc: Liam Girdwood, linux-next, linux-kernel, Laxman Dewangan,
Stephen Warren
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the sound-asoc tree with the regmap tree
2012-05-10 9:05 ` Stephen Rothwell
@ 2012-05-10 9:36 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2012-05-10 9:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Liam Girdwood, linux-next, linux-kernel, Laxman Dewangan,
Stephen Warren
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-05-10 9:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-10 4:25 linux-next: manual merge of the sound-asoc tree with the regmap tree Stephen Rothwell
2012-05-10 4:42 ` Laxman Dewangan
2012-05-10 8:53 ` Mark Brown
2012-05-10 9:05 ` Stephen Rothwell
2012-05-10 9:36 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).