linux-kernel - Re: linux-next: manual merge of the regmap tree with the mfd 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 for Android: free password hash cracker in your pocket

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

Date:	Tue, 20 Sep 2011 11:05:42 +0100
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Stephen Rothwell <sfr@....ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: Re: linux-next: manual merge of the regmap tree with the mfd tree

On Tue, Sep 20, 2011 at 03:42:18PM +1000, Stephen Rothwell wrote:

> I am not sure of the resolution here, so I just used the regmap tree
> version (which drops the shutdown member of wm8311_spi_driver added in
> the mfd version).

The shutdown member should be added.  I'll cherry pick the shutdown
change over into my branch which should resolve the issue.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/