Message ID | 20110826082558.GC7526@pengutronix.de |
---|---|
State | New |
Headers | show |
On Friday 26 August 2011, Sascha Hauer wrote: > Arnd, > > Since you haven't pulled this yet, here is an update: > > > The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c: > > Linux 3.1-rc3 (2011-08-22 11:42:53 -0700) > > are available in the git repository at: > git://git.pengutronix.de/git/imx/linux-2.6.git imx-cleanups-for-arnd Pulled it now, thanks and sorry for the delay! Arnd
On Friday 26 August 2011, Sascha Hauer wrote: > Shawn Guo (7): > arm/mxc: do not use gpio_to_irq() for static initializers > gpio/mxc: add .to_irq for gpio chip > arm/mxc: use gpiolib helper for gpio_to_irq > gpio/mxc: move irq_to_gpio() into gpio-mxc driver > arm/mxc: move IMX_GPIO_NR into mach/hardware.h > gpio/mxs: move irq_to_gpio() into gpio-mxs driver > arm/mxs: move MXS_GPIO_NR into mach/mxs.h I got conflicts between these patches and the gpio cleanups in Russell's gpio branch. For now, I have reverted Shawn's patches so that we can get build coverage of the rest in linux-next without annoying Stephen too much. Shawn, can you please have a look for a better resolution here? Maybe it's best of you rebase these patches on top of Russell's tree and let him merge them. Arnd
On Fri, Aug 26, 2011 at 07:23:26PM +0200, Arnd Bergmann wrote: > On Friday 26 August 2011, Sascha Hauer wrote: > > Shawn Guo (7): > > arm/mxc: do not use gpio_to_irq() for static initializers > > gpio/mxc: add .to_irq for gpio chip > > arm/mxc: use gpiolib helper for gpio_to_irq > > gpio/mxc: move irq_to_gpio() into gpio-mxc driver > > arm/mxc: move IMX_GPIO_NR into mach/hardware.h > > gpio/mxs: move irq_to_gpio() into gpio-mxs driver > > arm/mxs: move MXS_GPIO_NR into mach/mxs.h > > I got conflicts between these patches and the gpio cleanups in Russell's > gpio branch. For now, I have reverted Shawn's patches so that we > can get build coverage of the rest in linux-next without annoying > Stephen too much. I don't know the situation exactly at the moment, but I remember that Shawn originally sent the patches based on rmks patchset. I reworked them to fit onto mainline to be able to apply them and decided that the conflicts were easy enough to solve upstream. Sascha
On Saturday 27 August 2011 13:14:26 Sascha Hauer wrote: > > I got conflicts between these patches and the gpio cleanups in Russell's > > gpio branch. For now, I have reverted Shawn's patches so that we > > can get build coverage of the rest in linux-next without annoying > > Stephen too much. > > I don't know the situation exactly at the moment, but I remember that > Shawn originally sent the patches based on rmks patchset. I reworked > them to fit onto mainline to be able to apply them and decided that > the conflicts were easy enough to solve upstream. Ok, I can have another look on monday, maybe I just didn't look hard enough to figure out how to resolve them. Arnd