From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Liam Girdwood <lrg@ti.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Laxman Dewangan <ldewangan@nvidia.com>,
Stephen Warren <swarren@nvidia.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the regmap tree
Date: Thu, 10 May 2012 09:53:55 +0100 [thread overview]
Message-ID: <20120510085355.GC3908@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20120510142552.35f8e15042053707a2086905@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2012-05-10 8:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2012-05-10 9:05 ` Stephen Rothwell
2012-05-10 9:36 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120510085355.GC3908@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=ldewangan@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@ti.com \
--cc=sfr@canb.auug.org.au \
--cc=swarren@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.