From: Thierry Reding <thierry.reding@avionic-design.de>
To: Bryan Wu <cooloney@gmail.com>
Cc: florian.vaussard@epfl.ch, Richard Purdie <rpurdie@rpsys.net>,
Peter Ujfalusi <peter.ujfalusi@ti.com>,
linux-leds@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 3/3] leds: leds-pwm: Defer led_pwm_set() if PWM can sleep
Date: Fri, 15 Mar 2013 19:59:54 +0100 [thread overview]
Message-ID: <20130315185953.GA11351@avionic-0098.mockup.avionic-design.de> (raw)
In-Reply-To: <CAK5ve-+TfHmvx8fiim2yyZhKbhgieO-WDqd+HG7ViLm=Fk3zNA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1521 bytes --]
On Fri, Mar 15, 2013 at 10:08:57AM -0700, Bryan Wu wrote:
> On Tue, Mar 12, 2013 at 3:06 AM, Florian Vaussard
> <florian.vaussard@epfl.ch> wrote:
> > Hi Bryan,
> >
> >
> >>>>>
> >>>>> Bryan, I assume that you'll be taking this? It doesn't apply cleanly to
> >>>>> my tree, probably because of Peter's recent changes that you took
> >>>>> through your tree and Florian based his patches on top of that. The
> >>>>> conflict resolution should be trivial, though.
> >>>>>
> >>>>
> >>>> It seems that this patch was not taken. Could you pull it, as the other
> >>>> part is already in linux-pwm? Or is there any show stopper?
> >>>>
> >>>
> >>> Ping? Who should merge this?
> >>
> >>
> >> I assume Bryan will take it through the LED tree? Patches 1 & 2 went
> >> into v3.9-rc1 through the PWM tree.
> >>
> >
> > Ping ?
> >
>
> Hi Florian and Thierry,
>
> Sorry, guys. My bad! I'm using GMAIL filtering my emails. This email
> goes into my arm-linux mail list archive and I totally missed it.
>
> I can merge this patch into my for-next branch, but it will be in 3.10
> not 3.9-rcX.
>
> Or Thierry, can you merge that to 3.9-rcX through your tree with my Ack?
I think 3.10 would be fine. We missed the merge window on this one and
it isn't really a fix so it's a bit late for 3.9 now.
If Florian really absolutely needs this it can probably be done, but if
he can wait another few weeks it's certainly worth taking it through
linux-next for a while just to be safe.
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-03-15 19:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 14:00 [PATCH v3 0/3] leds-pwm: Defer PWM calls " Florian Vaussard
2013-01-28 14:00 ` [PATCH v3 1/3] pwm: Add pwm_can_sleep() as exported API to users Florian Vaussard
2013-01-29 8:20 ` Peter Ujfalusi
2013-01-30 8:14 ` Thierry Reding
2013-01-28 14:00 ` [PATCH v3 2/3] pwm: Add can_sleep property to drivers Florian Vaussard
2013-01-30 8:15 ` Thierry Reding
2013-01-28 14:00 ` [PATCH v3 3/3] leds: leds-pwm: Defer led_pwm_set() if PWM can sleep Florian Vaussard
2013-01-29 8:20 ` Peter Ujfalusi
2013-01-30 8:17 ` Thierry Reding
2013-02-04 8:53 ` Florian Vaussard
2013-02-27 16:08 ` Florian Vaussard
2013-03-04 10:44 ` Florian Vaussard
2013-03-04 10:58 ` Thierry Reding
2013-03-05 15:39 ` Florian Vaussard
2013-03-12 10:06 ` Florian Vaussard
2013-03-15 17:08 ` Bryan Wu
2013-03-15 18:59 ` Thierry Reding [this message]
2013-03-15 20:09 ` Florian Vaussard
2013-03-15 21:02 ` Bryan Wu
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=20130315185953.GA11351@avionic-0098.mockup.avionic-design.de \
--to=thierry.reding@avionic-design.de \
--cc=cooloney@gmail.com \
--cc=florian.vaussard@epfl.ch \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
--cc=rpurdie@rpsys.net \
/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
Powered by JetHome