Re: linux-next: manual merge of the pwm tree with the leds tree

2014-05-23 Thread Alexandre Belloni
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

Re: linux-next: manual merge of the pwm tree with the leds tree

2014-05-23 Thread Thierry Reding
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

Re: linux-next: manual merge of the pwm tree with the leds tree

2014-05-23 Thread Thierry Reding
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

Re: linux-next: manual merge of the pwm tree with the leds tree

2014-05-23 Thread Alexandre Belloni
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

linux-next: manual merge of the pwm tree with the leds tree

2014-05-22 Thread Stephen Rothwell
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")

linux-next: manual merge of the pwm tree with the leds tree

2014-05-22 Thread Stephen Rothwell
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