From: Roland Stigge <stigge@antcom.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Wolfram Sang <w.sang@pengutronix.de>,
linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
Jean Delvare <khali@linux-fr.org>,
Ben Dooks <ben-linux@fluff.org>, Arnd Bergmann <arnd@arndb.de>
Subject: Re: [PULL REQUEST] i2c-embedded for 3.5
Date: Sat, 26 May 2012 17:23:16 +0200 [thread overview]
Message-ID: <4FC0F564.6040609@antcom.de> (raw)
In-Reply-To: <20120526140650.GA7133@pengutronix.de>
Hi,
On 26/05/12 16:06, Wolfram Sang wrote:
> Note that you will get a trivial merge-conflict because some
> lpc32xx-patches have already come in via arm-soc to reduce dependencies.
> I read that you want to see such conflicts so I didn't take any actions.
> I'll add Arnd and Roland to CC, because they know best about LPC32xx
> changes.
There are already some i2c commits in master that came via arm-soc.
Expect conflicts with some LPC32xx related commits from i2c-embedded.
They are basically the same patches, applied as different commits
though, sorry. But should be easy to resolve.
Roland
prev parent reply other threads:[~2012-05-26 15:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-26 14:06 [PULL REQUEST] i2c-embedded for 3.5 Wolfram Sang
2012-05-26 15:23 ` Roland Stigge [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=4FC0F564.6040609@antcom.de \
--to=stigge@antcom.de \
--cc=arnd@arndb.de \
--cc=ben-linux@fluff.org \
--cc=khali@linux-fr.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=w.sang@pengutronix.de \
/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