From: Mark Brown <broonie@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@st•com>,
Dimitris Papastamos <dp@opensource•wolfsonmicro.com>
Subject: Re: linux-next: manual merge of the regmap tree with Linus' tree
Date: Thu, 9 May 2013 11:01:49 +0100 [thread overview]
Message-ID: <20130509100149.GD7478@sirena.org.uk> (raw)
In-Reply-To: <20130509115659.fed19d305e0b180697060f95@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 767 bytes --]
On Thu, May 09, 2013 at 11:56:59AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the regmap tree got a conflict in
> drivers/base/regmap/regmap-debugfs.c between commit 480738de0e07
> ("regmap: debugfs: Simplify calculation of `c->max_reg'") from Linus'
> tree and commit 5e3f5901ac6c ("regmap: debugfs: Fix start_reg
> calculation") from the regmap tree.
> I am not sure that the latter patch is ever required on top of the
> former, so for now I just used the former version (except for the last
> hunk) (see below) and can carry the fix as necessary (no action is
> required).
> Please let me know if this is the incorrect resolution.
Looks sensible. I'll resolve everything on top of -rc1 once that's
released but I think that's the solution.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-05-09 10:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 1:56 linux-next: manual merge of the regmap tree with Linus' tree Stephen Rothwell
2013-05-09 10:01 ` Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-31 2:59 Stephen Rothwell
2012-01-31 11:12 ` 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=20130509100149.GD7478@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=dp@opensource$(echo .)wolfsonmicro.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=srinivas.kandagatla@st$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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