From: jkrzyszt@tis.icnet.pl (Janusz Krzysztofik)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Sat, 10 Mar 2012 10:55:04 +0100 [thread overview]
Message-ID: <1678557.FviZqEVemH@vclass> (raw)
In-Reply-To: <20120308165116.d400947f35e40a923e9c6ad0@canb.auug.org.au>
On Thursday 08 of March 2012 16:51:16 Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap1/board-ams-delta.c between commit ddba6c7f7ec6
> ("OMAP1: pass LCD config with omapfb_set_lcd_config()") from the
> omap_dss2 tree and commits 5ca6180fa6d7 ("ARM: OMAP1: ams-delta:
> supersede custom led device by leds-gpio") and 2e3ee9f45b3c ("ARM: OMAP1:
> Move most of plat/io.h into local iomap.h") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Hi,
Your resolution looks good to me, thanks!
Janusz
next prev parent reply other threads:[~2012-03-10 9:55 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 5:51 linux-next: manual merge of the arm-soc tree with the omap_dss2 tree Stephen Rothwell
2012-03-10 9:55 ` Janusz Krzysztofik [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-08 5:55 Stephen Rothwell
2012-03-08 5:58 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-09 7:09 Stephen Rothwell
2012-03-13 8:21 Stephen Rothwell
2012-05-14 8:51 Stephen Rothwell
2012-09-17 9:23 Stephen Rothwell
2012-09-24 9:53 Stephen Rothwell
2012-09-24 12:43 ` Arnd Bergmann
2012-09-24 13:11 ` Tomi Valkeinen
2012-09-24 16:19 ` Tony Lindgren
2012-11-26 10:56 Stephen Rothwell
2012-11-26 15:53 ` Tony Lindgren
2012-11-30 5:18 Stephen Rothwell
2012-12-03 5:52 Stephen Rothwell
2013-04-09 7:40 Stephen Rothwell
2013-04-09 9:32 ` Arnd Bergmann
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=1678557.FviZqEVemH@vclass \
--to=jkrzyszt@tis.icnet.pl \
--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;
as well as URLs for NNTP newsgroup(s).