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 10:36:50 +0100 [thread overview]
Message-ID: <20120510093650.GL3908@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20120510190554.6055315139a68ef0b1c48261@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2012-05-10 9:36 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
2012-05-10 9:05 ` Stephen Rothwell
2012-05-10 9:36 ` Mark Brown [this message]
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=20120510093650.GL3908@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 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).