Messages in this thread | | | Date | Tue, 31 Jan 2012 13:59:50 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the regmap tree with Linus' tree |
| |
Hi Mark,
Today's linux-next merge of the regmap tree got a conflict in drivers/base/regmap/regmap.c between commit 421e8d2de3bd ("regmap: Reset cache status when reinitialsing the cache") from Linus' tree and commit a24f64a64837 ("regmap: Reset device debugfs when reinitialising the cache") from the regmap tree.
I fixed it up (I think - see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/base/regmap/regmap.c index 2cf4bbc,efe287e..0000000 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@@ -284,9 -347,8 +347,11 @@@ int regmap_reinit_cache(struct regmap * map->precious_reg = config->precious_reg; map->cache_type = config->cache_type; + map->cache_bypass = false; + map->cache_only = false; + + regmap_debugfs_init(map); + ret = regcache_init(map, config); mutex_unlock(&map->lock); [unhandled content-type:application/pgp-signature] | |