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

2014-02-27 Thread Thierry Reding
On Thu, Feb 27, 2014 at 03:56:13PM +1100, Stephen Rothwell wrote: > Hi Thierry, > > Today's linux-next merge of the pwm tree got a conflict in > arch/arm/Kconfig between commit f6723b569a67 ("usb: host: remove selects > of USB_ARCH_HAS_?HCI") from the usb tree and commit 557fe99d9d49 ("pwm: > Remo

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

2014-02-26 Thread Stephen Rothwell
Hi Thierry, Today's linux-next merge of the pwm tree got a conflict in arch/arm/Kconfig between commit f6723b569a67 ("usb: host: remove selects of USB_ARCH_HAS_?HCI") from the usb tree and commit 557fe99d9d49 ("pwm: Remove obsolete HAVE_PWM Kconfig symbol") from the pwm tree. I fixed it up (see b