From: Samuel Ortiz <sameo@linux.intel.com>
To: Axel Lin <axel.lin@gmail.com>
Cc: linux-kernel@vger.kernel.org,
"Marc Reilly" <marc@cpdesign.com.au>,
"Philippe Rétornaz" <philippe.retornaz@epfl.ch>
Subject: Re: [PATCH] mfd: mc13xxx-spi: fix merge conflict
Date: Mon, 2 Jul 2012 16:53:43 +0200 [thread overview]
Message-ID: <20120702145343.GK22065@sortiz-mobl> (raw)
In-Reply-To: <1341216180.20054.1.camel@phoenix>
Hi Axel,
On Mon, Jul 02, 2012 at 04:03:00PM +0800, Axel Lin wrote:
> This patch fixes conflict between commit 8ae3559
> "mfd: mc13xxx workaround SPI hardware bug on i.Mx"
> and commit 10c7a5d "mfd: Use devm_* APIs for mc13xxx".
>
> commit 8ae3559 changes regmap_init_spi to regmap_init.
> So now we need to use devm_regmap_init rather than devm_regmap_init_spi.
Good catch, thanks a lot.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
prev parent reply other threads:[~2012-07-02 14:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-02 8:03 [PATCH] mfd: mc13xxx-spi: fix merge conflict Axel Lin
2012-07-02 14:53 ` Samuel Ortiz [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=20120702145343.GK22065@sortiz-mobl \
--to=sameo@linux.intel.com \
--cc=axel.lin@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marc@cpdesign.com.au \
--cc=philippe.retornaz@epfl.ch \
/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