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

On Mon, Nov 10, 2014 at 03:24:26PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/mfd/syscon.c between commit d4ad08b424c1 ("mfd: syscon: > Decouple syscon interface from platform devices") from the mfd tree and > commit 7

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

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/mfd/syscon.c between commit d4ad08b424c1 ("mfd: syscon: Decouple syscon interface from platform devices") from the mfd tree and commit 78a835416ad6 ("mfd: drop owner assignment from platform_drivers") from the driv

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

On Thu, Nov 29, 2012 at 02:43:02PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/gpio/gpio-tps6586x.c between commit fe39f2f4dc84 ("mfd: Implement > tps6586x gpio_to_irq") from the mfd tree and commit 3836309d9346 ("gpio:

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

On Thu, Nov 29, 2012 at 02:47:12PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/mfd/ab8500-core.c between commit 8ae754ebd5ed ("mfd: ab8500-core: > Remove unused ab8500-gpio IRQ ranges") from the mfd tree and commit > a9

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

On Thu, Nov 29, 2012 at 02:57:14PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/mfd/sta2x11-mfd.c between various commits from the mfd tree and > commits f791be492f76 ("mfd: remove use of __devinit"), a9e9ce4c4167 > ("mf

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

On Thu, Nov 29, 2012 at 02:50:39PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/mfd/da9052-core.c between commit 8bad1abd6303 ("mfd: da9052: > Introduce da9052-irq.c") from the mfd tree and commit a9e9ce4c4167 ("mfd: > r

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

On Thu, Nov 29, 2012 at 03:00:44PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/mfd/tps65090.c between various commits from the mfd tree and > commits 84449216b01f ("mfd: remove use of __devexit_p"), f791be492f76 > ("mfd

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

On Thu, Nov 29, 2012 at 03:18:04PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/power/da9052-battery.c between commit 4b5edf7887c6 ("power: > da9052-battery: Convert to the new da9052 interrupt functions") from the > mfd

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

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/power/da9052-battery.c between commit 4b5edf7887c6 ("power: da9052-battery: Convert to the new da9052 interrupt functions") from the mfd tree and commit c8afa6406e60 ("power: remove use of __devinit") from the driv

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

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/mfd/tps65090.c between various commits from the mfd tree and commits 84449216b01f ("mfd: remove use of __devexit_p"), f791be492f76 ("mfd: remove use of __devinit") and 4740f73fe538 ("mfd: remove use of __devexit")

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

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/mfd/sta2x11-mfd.c between various commits from the mfd tree and commits f791be492f76 ("mfd: remove use of __devinit"), a9e9ce4c4167 ("mfd: remove use of __devinitdata") and a73e5df16b52 ("mfd: remove use of __devin

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

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/mfd/da9052-core.c between commit 8bad1abd6303 ("mfd: da9052: Introduce da9052-irq.c") from the mfd tree and commit a9e9ce4c4167 ("mfd: remove use of __devinitdata") from the driver-core tree. I fixed it up (see be

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

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/mfd/ab8500-core.c between commit 8ae754ebd5ed ("mfd: ab8500-core: Remove unused ab8500-gpio IRQ ranges") from the mfd tree and commit a9e9ce4c4167 ("mfd: remove use of __devinitdata") from the driver-core tree. I

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

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/gpio/gpio-tps6586x.c between commit fe39f2f4dc84 ("mfd: Implement tps6586x gpio_to_irq") from the mfd tree and commit 3836309d9346 ("gpio: remove use of __devinit") from the driver-core tree. I fixed it up (see be