From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tony Lindgren <tony@atomide.com>, Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
Date: Wed, 21 Sep 2011 09:12:04 +0300 [thread overview]
Message-ID: <1316585524.1949.6.camel@deskari> (raw)
In-Reply-To: <20110921125844.d83e02ba538d7626d6bdefcf@canb.auug.org.au>
Hi Stephen,
On Wed, 2011-09-21 at 12:58 +1000, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> arch/arm/mach-omap2/board-4430sdp.c between commit 8f5b5a41ebc7 ("ARM:
> OMAP: Introduce SoC specific early_init") from the arm-soc tree and
> commit 58282610da02 ("OMAP: 4430SDP: Remove unneeded lcd config") from
> the omap_dss2 tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks, looks correct.
Tomi
next prev parent reply other threads:[~2011-09-21 6:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 2:58 linux-next: manual merge of the omap_dss2 tree with the arm-soc tree Stephen Rothwell
2011-09-21 6:12 ` Tomi Valkeinen [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-10-04 4:06 Stephen Rothwell
2011-10-04 4:06 Stephen Rothwell
2011-10-04 4:06 Stephen Rothwell
2011-10-04 4:06 Stephen Rothwell
2011-10-04 4:06 Stephen Rothwell
2011-10-11 5:50 Stephen Rothwell
2014-05-30 3:38 Stephen Rothwell
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=1316585524.1949.6.camel@deskari \
--to=tomi.valkeinen@ti.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tony@atomide.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