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

2012-11-29 Thread Grant Likely
On Thu, 29 Nov 2012 15:57:23 +1100, Stephen Rothwell wrote: > Hi Grant, > > Today's linux-next merge of the gpio tree got a conflict in > drivers/gpio/gpio-em.c between commit 3836309d9346 ("gpio: remove use of > __devinit") from the driver-core tree and commit 7385500a49b7 ("gpio/em: > convert

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

2012-11-29 Thread Grant Likely
On Thu, 29 Nov 2012 15:57:23 +1100, Stephen Rothwell s...@canb.auug.org.au wrote: Hi Grant, Today's linux-next merge of the gpio tree got a conflict in drivers/gpio/gpio-em.c between commit 3836309d9346 (gpio: remove use of __devinit) from the driver-core tree and commit 7385500a49b7

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

2012-11-28 Thread Greg KH
On Thu, Nov 29, 2012 at 03:57:23PM +1100, Stephen Rothwell wrote: > Hi Grant, > > Today's linux-next merge of the gpio tree got a conflict in > drivers/gpio/gpio-em.c between commit 3836309d9346 ("gpio: remove use of > __devinit") from the driver-core tree and commit 7385500a49b7 ("gpio/em: >

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

2012-11-28 Thread Stephen Rothwell
Hi Grant, Today's linux-next merge of the gpio tree got a conflict in drivers/gpio/gpio-em.c between commit 3836309d9346 ("gpio: remove use of __devinit") from the driver-core tree and commit 7385500a49b7 ("gpio/em: convert to linear IRQ domain") from the gpio tree. I fixed it up (see below) and

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

2012-11-28 Thread Stephen Rothwell
Hi Grant, Today's linux-next merge of the gpio tree got a conflict in drivers/gpio/gpio-em.c between commit 3836309d9346 (gpio: remove use of __devinit) from the driver-core tree and commit 7385500a49b7 (gpio/em: convert to linear IRQ domain) from the gpio tree. I fixed it up (see below) and can

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

2012-11-28 Thread Greg KH
On Thu, Nov 29, 2012 at 03:57:23PM +1100, Stephen Rothwell wrote: Hi Grant, Today's linux-next merge of the gpio tree got a conflict in drivers/gpio/gpio-em.c between commit 3836309d9346 (gpio: remove use of __devinit) from the driver-core tree and commit 7385500a49b7 (gpio/em: convert to