From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tomi Valkeinen <tomi.valkeinen@nokia.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Roger Quadros <roger.quadros@nokia.com>,
Jarkko Nikula <jhnikula@gmail.com>,
linux-omap@vger.kernel.org
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap tree
Date: Mon, 10 May 2010 13:20:56 -0700 [thread overview]
Message-ID: <20100510202056.GG16460@atomide.com> (raw)
In-Reply-To: <20100507134334.75808884.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [100506 22:05]:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> arch/arm/mach-omap2/board-rx51-peripherals.c between commit
> e87da74e34ad151e6ae75ebb7a7bf447f02c0004 ("omap: rx51: Add supplies for
> the tlv320aic3x codec driver") from the omap tree and commit
> a693839eab0292aa234d7a6f48d40389389baebb ("OMAP: RX51: Add "vdds_sdi"
> supply voltage for SDI") from the omap_dss2 tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks again Stephen. We will move the conflicting DSS board-*.c
file changes over to omap for next.
Tomi, do you want to do a branch of board-*.c patches for me to
pull, or do you want me to just pick this one?
Regards,
Tony
next prev parent reply other threads:[~2010-05-10 20:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-07 3:43 linux-next: manual merge of the omap_dss2 tree with the omap tree Stephen Rothwell
2010-05-10 20:20 ` Tony Lindgren [this message]
2010-05-12 8:59 ` Tomi Valkeinen
2010-05-14 19:09 ` Tony Lindgren
2010-05-17 7:07 ` Tomi Valkeinen
-- strict thread matches above, loose matches on Subject: below --
2011-02-21 3:16 Stephen Rothwell
2011-02-21 8:47 ` Tomi Valkeinen
2011-02-24 21:23 ` Tony Lindgren
2011-02-18 2:25 Stephen Rothwell
2011-02-17 2:10 Stephen Rothwell
2011-02-17 2:10 Stephen Rothwell
2010-02-08 6:25 Stephen Rothwell
2010-02-08 9:29 ` Tomi Valkeinen
2010-02-08 10:57 ` Stephen Rothwell
2010-02-08 11:43 ` Tomi Valkeinen
2010-02-09 16:52 ` Tony Lindgren
2010-02-10 8:20 ` Tomi Valkeinen
2010-02-10 9:52 ` Hiremath, Vaibhav
2010-02-03 4:29 Stephen Rothwell
2010-02-03 12:29 ` Grazvydas Ignotas
2010-02-03 17:12 ` Tony Lindgren
2010-02-04 9:42 ` Tomi Valkeinen
2009-11-16 5:04 Stephen Rothwell
2009-11-16 10:06 ` Tomi Valkeinen
2009-11-16 18:34 ` Tony Lindgren
2009-11-17 10:00 ` Tomi Valkeinen
2009-11-17 23:49 ` Stephen Rothwell
2009-11-17 3:08 ` Sid Boyce
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=20100510202056.GG16460@atomide.com \
--to=tony@atomide.com \
--cc=jhnikula@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=roger.quadros@nokia.com \
--cc=sfr@canb.auug.org.au \
--cc=tomi.valkeinen@nokia.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).