From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] i.MX cleanups for next
Date: Sat, 27 Aug 2011 20:10:55 +0200 [thread overview]
Message-ID: <4805311.BZJd9h77Nj@wuerfel> (raw)
In-Reply-To: <20110827111426.GJ31404@pengutronix.de>
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
prev parent reply other threads:[~2011-08-27 18:10 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
2011-08-27 11:14 ` Sascha Hauer
2011-08-27 18:10 ` Arnd Bergmann [this message]
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=4805311.BZJd9h77Nj@wuerfel \
--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