Messages in this thread | | | Date | Fri, 23 May 2014 10:42:18 +0200 | From | Alexandre Belloni <> | Subject | Re: linux-next: manual merge of the pwm tree with the leds tree |
| |
On 23/05/2014 at 09:19:41 +0200, Thierry Reding wrote : > On Thu, May 22, 2014 at 07:24:23PM +1000, Stephen Rothwell wrote: > > Hi Thierry, > > > > Today's linux-next merge of the pwm tree got a conflict in > > drivers/leds/leds-pwm.c between commit 5f7b03dc2ab5 ("leds: leds-pwm: > > provide a common function to setup a single led-pwm device") from the > > leds tree and commit 81225bed3273 ("leds: leds-pwm: retrieve configured > > PWM period") from the pwm tree. > > > > I fixed it up (I think - see below) and can carry the fix as necessary > > (no action is required). > > The resolution below looks good to me. Thanks! > > Alexandre, Bryan, as far as I can tell there are no dependencies between > this patch and the rest of the series that Alexandre sent, so perhaps it > would be a better idea to take this particular patch via Bryan's leds > tree? > > Then again the resolution looks like something that Linus can reasonably > handle, so maybe things are fine as-is. >
I'm fine with either solution, tell me if you want me to rebase my patch.
-- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
| |