linux-next: manual merge of the regmap tree with Linus' tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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: pgp00000.pgp
Description: PGP signature