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

2015-08-06 Thread Viresh Kumar
On 07-08-15, 15:26, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in: > > drivers/cpufreq/cpufreq.c > > between commit: > > 559ed40752dc ("cpufreq: Avoid attempts to create duplicate symbolic links") > > from Linus' tree and commit:

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

2015-08-06 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in: drivers/cpufreq/cpufreq.c between commit: 559ed40752dc ("cpufreq: Avoid attempts to create duplicate symbolic links") from Linus' tree and commit: 71db87ba5700 ("bus: subsys: update return type of ->remove_dev(

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

2014-12-14 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/rtc/rtc-snvs.c between commit 88221c32f985 ("rtc: snvs: fix build with CONFIG_PM_SLEEP disabled") from Linus' tree and commit 0929ae376ef3 ("rtc: drop owner assignment from platform_drivers") from the driver-core t

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

2013-01-22 Thread Greg KH
On Wed, Jan 23, 2013 at 03:15:52PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu: > Don't free chip label memory") from Linus' tree and commit 641d03422a59 > ("g

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

2013-01-22 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu: Don't free chip label memory") from Linus' tree and commit 641d03422a59 ("gpio: Convert to devm_ioremap_resource()") from the driver-core tree. I fixed