From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the regmap tree with Linus' tree
Date: Tue, 31 Jan 2012 11:12:26 +0000 [thread overview]
Message-ID: <20120131111226.GB18444@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20120131135950.0da0eb3e0da92b9a3b658354@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
On Tue, Jan 31, 2012 at 01:59:50PM +1100, Stephen Rothwell wrote:
> I fixed it up (I think - see below) and can carry the fix as necessary.
Yes, that's the fix I've got. I'm kind of surprised git didn't figure
this out for itself, the tag I sent to Linus should be pre-merged into
my -next branch as it was sitting in -next for a while. I'll probably
merge Linus' tree up at some point when he tags a new -rc. Thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-01-31 11:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 2:59 linux-next: manual merge of the regmap tree with Linus' tree Stephen Rothwell
2012-01-31 11:12 ` Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-05-09 1:56 Stephen Rothwell
2013-05-09 10:01 ` 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=20120131111226.GB18444@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.