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,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the arm tree
Date: Wed, 21 Sep 2011 09:13:30 +0300 [thread overview]
Message-ID: <1316585610.1949.8.camel@deskari> (raw)
In-Reply-To: <20110921130222.58e566a354feef69f3064d04@canb.auug.org.au>
On Wed, 2011-09-21 at 13:02 +1000, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c
> drivers/video/omap/lcd_overo.c between commit 1bc857f700fb ("ARM: gpio:
> omap: convert drivers to use asm/gpio.h rather than mach/gpio.h") from
> the arm tree and commits db3136b14a2b ("OMAPFB: Remove unused lcd
> drivers") and 0cde58449424 ("OMAPDSS: Port the Apollon display driver to
> DSS2") from the omap_dss2 tree.
>
> The latter two commist removed these files, so I did that.
Thanks, this is also correct.
Tomi
prev parent reply other threads:[~2011-09-21 6:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 3:02 linux-next: manual merge of the omap_dss2 tree with the arm tree Stephen Rothwell
2011-09-21 6:13 ` Tomi Valkeinen [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=1316585610.1949.8.camel@deskari \
--to=tomi.valkeinen@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/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