From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-input@vger.kernel.org,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org,
"Richard Purdie" <rpurdie@rpsys.net>,
kernel@pengutronix.de, "David Jander" <david@protonic.nl>,
"Jean Delvare" <khali@linux-fr.org>,
"Philippe Rétornaz" <philippe.retornaz@epfl.ch>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 0/6] mc13783 cleanup
Date: Thu, 15 Sep 2011 18:03:21 +0200 [thread overview]
Message-ID: <20110915160321.GA29357@pengutronix.de> (raw)
In-Reply-To: <20110915151213.GE32263@sortiz-mobl>
Hi Samuel,
On Thu, Sep 15, 2011 at 05:12:13PM +0200, Samuel Ortiz wrote:
> On Thu, Aug 25, 2011 at 09:05:12AM +0200, Philippe Rétornaz wrote:
> > Le mercredi 24 août 2011 15:27:40, Uwe Kleine-König a écrit :
> > > Hello,
> > >
> > > this series removes the long obsolte mc13783 API after fixing all
> > > remaining users.
> >
> > I posted a patch last month which was touching this MFD too.
> > We will need to synchronize both patch.
> I applied Uwe's patchset now.
Thanks.
> Could you please sync your code and send me a
> patchset that applies on top of:
>
> git://git.infradead.org/users/sameo/mfd-2.6.git for-next
You can fetch the updated series from
git://git.pengutronix.de/git/ukl/linux-2.6.git mc13783
I also included the last patch that Sascha commented with:
Please ping once the rest is merged.
This is OK as I'm currently substituting Sascha for imx maintainer
duties while he is on vacation. Merging the above branch into the
current imx/for-next branch yields a merge conflict in
drivers/rtc/rtc-twl.c which is only touched on your side and in Linus'
tree below imx/for-next.
I guess you can drop 54d96ef785b5 as it is the same as dec35d19c4 +
34d623d.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-09-15 16:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-24 13:27 [PATCH 0/6] mc13783 cleanup Uwe Kleine-König
[not found] ` <1314192505-23499-1-git-send-email-u.kleine-koenig@pengutronix.de>
2011-08-24 13:28 ` [PATCH 2/6] mfd/mc13xxx: provide a generic version of adc_do_conversion Uwe Kleine-König
2011-08-24 13:28 ` [PATCH 3/6] input/mc13783-ts: convert to mc13xxx API Uwe Kleine-König
2011-08-25 7:05 ` [PATCH 0/6] mc13783 cleanup Philippe Rétornaz
2011-08-25 7:57 ` Uwe Kleine-König
2011-09-15 15:12 ` Samuel Ortiz
2011-09-15 16:03 ` Uwe Kleine-König [this message]
2011-09-18 16:33 ` Samuel Ortiz
2011-09-15 15:10 ` Samuel Ortiz
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=20110915160321.GA29357@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=david@protonic.nl \
--cc=dmitry.torokhov@gmail.com \
--cc=kernel@pengutronix.de \
--cc=khali@linux-fr.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
--cc=philippe.retornaz@epfl.ch \
--cc=rpurdie@rpsys.net \
--cc=s.hauer@pengutronix.de \
--cc=sameo@linux.intel.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).