From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Mon, 24 Sep 2012 12:43:39 +0000 [thread overview]
Message-ID: <201209241243.39462.arnd@arndb.de> (raw)
In-Reply-To: <20120924195305.588277e94ce701abc5e5a6c5@canb.auug.org.au>
On Monday 24 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/video/omap/lcd_ams_delta.c between commit 9586778de558 ("OMAPFB1:
> remove unnecessary includes") from the tree and commit e27e35ec735f
> ("ARM: OMAP1: Move board-ams-delta.h from plat to mach") from the arm-soc
> tree.
>
> The latter removed a superset of the former (as far as include files is
> concerned), so I used that and can carry the fix as necessary (no action
> is required).
>
Hi Stephen,
I looked at all your reports and your fixes are looking good to me.
I'm already building all ARM defconfigs now and have fixup patches for the
instances that went wrong or introduced new warnings, I'll do that again
on top of today's linux-next tree.
The merge window is going to be fun with all those conflicts, but I don't
have a better idea either.
Arnd
next prev parent reply other threads:[~2012-09-24 12:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 9:53 linux-next: manual merge of the arm-soc tree with the omap_dss2 tree Stephen Rothwell
2012-09-24 12:43 ` Arnd Bergmann [this message]
2012-09-24 13:11 ` Tomi Valkeinen
2012-09-24 16:19 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2013-04-09 7:40 Stephen Rothwell
2013-04-09 9:32 ` Arnd Bergmann
2012-12-03 5:52 Stephen Rothwell
2012-11-30 5:18 Stephen Rothwell
2012-11-26 10:56 Stephen Rothwell
2012-11-26 15:53 ` Tony Lindgren
2012-09-17 9:23 Stephen Rothwell
2012-05-14 8:51 Stephen Rothwell
2012-03-13 8:21 Stephen Rothwell
2012-03-09 7:09 Stephen Rothwell
2012-03-08 6:00 Stephen Rothwell
2012-03-08 16:16 ` Arnd Bergmann
2012-03-09 9:35 ` Tomi Valkeinen
2012-03-09 11:50 ` Arnd Bergmann
2012-03-09 12:14 ` Tomi Valkeinen
2012-03-09 12:26 ` Arnd Bergmann
2012-03-09 12:31 ` Tomi Valkeinen
2012-03-08 5:58 Stephen Rothwell
2012-03-08 5:55 Stephen Rothwell
2012-03-08 5:51 Stephen Rothwell
2012-03-10 9:55 ` Janusz Krzysztofik
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=201209241243.39462.arnd@arndb.de \
--to=arnd@arndb.de \
--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=tomi.valkeinen@ti.com \
/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).