From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@st.com>,
Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Subject: linux-next: manual merge of the regmap tree with Linus' tree
Date: Thu, 9 May 2013 11:56:59 +1000 [thread overview]
Message-ID: <20130509115659.fed19d305e0b180697060f95@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
Hi Mark,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/base/regmap/regmap-debugfs.c
index 23b701f,6cd1b78a..0000000
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@@ -144,8 -146,7 +144,8 @@@ static unsigned int regmap_debugfs_get_
fpos_offset = from - c->min;
reg_offset = fpos_offset / map->debugfs_tot_len;
*pos = c->min + (reg_offset * map->debugfs_tot_len);
+ mutex_unlock(&map->cache_lock);
- return c->base_reg + reg_offset;
+ return c->base_reg + (reg_offset * map->reg_stride);
}
*pos = c->max;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-05-09 1:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 1:56 Stephen Rothwell [this message]
2013-05-09 10:01 ` linux-next: manual merge of the regmap tree with Linus' tree Mark Brown
-- 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=20130509115659.fed19d305e0b180697060f95@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=dp@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=srinivas.kandagatla@st.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).