From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] i.MX cleanups for next
Date: Fri, 26 Aug 2011 19:23:26 +0200 [thread overview]
Message-ID: <201108261923.26398.arnd@arndb.de> (raw)
In-Reply-To: <20110826082558.GC7526@pengutronix.de>
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
next prev parent reply other threads:[~2011-08-26 17:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-23 11:56 [GIT PULL] i.MX cleanups for next Sascha Hauer
2011-08-26 8:25 ` Sascha Hauer
2011-08-26 15:53 ` Arnd Bergmann
2011-08-26 17:23 ` Arnd Bergmann [this message]
2011-08-27 11:14 ` Sascha Hauer
2011-08-27 18:10 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201108261923.26398.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).