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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120131135950.0da0eb3e0da92b9a3b658354@canb.auug.org.au>
Date:	Tue, 31 Jan 2012 13:59:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
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@...b.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);

Content of type "application/pgp-signature" skipped