From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Felipe Balbi <balbi@ti.com>,
Wolfram Sang <w.sang@pengutronix.de>,
Shubhrajyoti D <shubhrajyoti@ti.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the i2c-embedded tree
Date: Thu, 13 Sep 2012 09:09:48 +0200 [thread overview]
Message-ID: <20120913070948.GC19497@pengutronix.de> (raw)
In-Reply-To: <20120913164120.cde08ac1517e641386b147d8@canb.auug.org.au>
Hi Stephen,
On Thu, Sep 13, 2012 at 04:41:20PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/i2c/busses/i2c-omap.c between commit d9ebd04d3476 ("i2c: omap:
> switch to devm_* API") from the i2c-embedded tree and commit 07baca6f8fc2
> ("i2c/i2c-omap: add a const qualifier") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
looks correct.
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2012-09-13 7:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-13 6:41 linux-next: manual merge of the arm-soc tree with the i2c-embedded tree Stephen Rothwell
2012-09-13 7:09 ` Uwe Kleine-König [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-15 5:27 Stephen Rothwell
2012-07-19 5:28 Stephen Rothwell
2012-07-10 6:41 Stephen Rothwell
2012-07-10 6:50 ` Stephen Rothwell
2012-07-10 8:38 ` Wolfram Sang
2012-07-12 13:12 ` Wolfram Sang
2012-07-12 15:54 ` Arnd Bergmann
2012-07-13 11:03 ` Lee Jones
[not found] ` <20120712131231.GH2194-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-07-14 21:34 ` Linus Walleij
2012-07-16 10:17 ` Wolfram Sang
2012-07-16 11:31 ` Lee Jones
2012-07-16 13:00 ` Wolfram Sang
2012-07-16 13:55 ` Lee Jones
2012-07-17 13:06 ` Mark Brown
2012-07-17 13:30 ` Lee Jones
2012-07-17 13:35 ` Mark Brown
2012-07-17 14:02 ` Lee Jones
2012-07-17 14:22 ` Mark Brown
2012-07-17 14:52 ` Lee Jones
[not found] ` <50057C1A.80606-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2012-07-17 15:20 ` Mark Brown
2012-07-18 5:33 ` Shawn Guo
2012-07-18 9:59 ` Mark Brown
2012-07-18 10:29 ` Lee Jones
2012-07-18 10:33 ` Mark Brown
2012-07-18 10:43 ` Lee Jones
2012-07-18 7:35 ` Lee Jones
2012-07-18 11:12 ` Mark Brown
2012-07-18 11:24 ` Lee Jones
2012-07-16 11:37 ` Linus Walleij
2012-07-16 12:35 ` Wolfram Sang
[not found] ` <20120716123550.GE17435-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-07-16 19:45 ` Linus Walleij
[not found] ` <CACRpkdaMB-n7XYcxE8QtAm-WrGc2DR0krfTjQZCbvOL1HYep1Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-16 20:04 ` Chris Ball
2012-07-17 13:10 ` Mark Brown
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=20120913070948.GC19497@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=shubhrajyoti@ti.com \
--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;
as well as URLs for NNTP newsgroup(s).