From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@au1.ibm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: linux-next: manual merge of the regmap tree with the mfd tree
Date: Tue, 20 Sep 2011 11:05:42 +0100 [thread overview]
Message-ID: <20110920100542.GC2387@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20110920154218.27c270321f7b24d6b2a8d862@au1.ibm.com>
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.
prev parent reply other threads:[~2011-09-20 10:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-20 5:42 linux-next: manual merge of the regmap tree with the mfd tree Stephen Rothwell
2011-09-20 10:05 ` Mark Brown [this message]
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=20110920100542.GC2387@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sfr@au1.ibm.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).