Re: linux-next: manual merge of the driver-core tree with the tree

2014-11-09 Thread Greg KH
On Mon, Nov 10, 2014 at 03:21:25PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio: > Make use of device property API") from the tree and commit > 81902d5f658f

Re: linux-next: manual merge of the driver-core tree with the tree

2014-11-09 Thread Stephen Rothwell
Hi all, On Mon, 10 Nov 2014 15:21:25 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio: > Make use of device property API") from the tree and commit > 81902d5f658f ("leds:

linux-next: manual merge of the driver-core tree with the tree

2014-11-09 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio: Make use of device property API") from the tree and commit 81902d5f658f ("leds: drop owner assignment from platform_drivers") from the driver-core tr

Re: linux-next: manual merge of the driver-core tree with the tree

2013-02-15 Thread Larry Finger
On 02/14/2013 11:24 PM, Greg KH wrote: On Fri, Feb 15, 2013 at 04:01:24PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30 ("rtlwifi: Rework Kconfig") from the wireless-nex

Re: linux-next: manual merge of the driver-core tree with the tree

2013-02-14 Thread Greg KH
On Fri, Feb 15, 2013 at 04:01:24PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30 > ("rtlwifi: Rework Kconfig") from the wireless-next tree and commit > 6cba014857f4

linux-next: manual merge of the driver-core tree with the tree

2013-02-14 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30 ("rtlwifi: Rework Kconfig") from the wireless-next tree and commit 6cba014857f4 ("drivers/net/wireless/rtlwifi: remove depends on CONFIG_EXPERIMENTAL") from