Messages in this thread | | | Date | Tue, 12 Mar 2013 11:06:15 +0100 | From | Florian Vaussard <> | Subject | Re: [PATCH v3 3/3] leds: leds-pwm: Defer led_pwm_set() if PWM can sleep |
| |
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 ?
Florian
| |