Messages in this thread | | | Date | Wed, 28 Nov 2012 21:17:19 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the gpio tree with the driver-core tree |
| |
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 linear IRQ domain") from the gpio tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good, thanks.
greg k-h
| |