linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Paul Mundt <lethal@linux-sh.org>
Cc: "linux-fbdev@vger.kernel.org" <linux-fbdev@vger.kernel.org>,
	"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: Re: [GIT PULL] omap display subsystem changes for 2.6.39
Date: Mon, 21 Mar 2011 13:05:11 +0000	[thread overview]
Message-ID: <1300712711.2891.125.camel@deskari> (raw)
In-Reply-To: <1300701083.2891.77.camel@deskari>

Hi,

On Mon, 2011-03-21 at 04:51 -0500, Tomi Valkeinen wrote:
> Hi Paul,
> 
> Here are OMAP display subsystem patches for 2.6.39 merge window. Quite a
> bit of them, and many changes also in arch/arm/mach-omap2, which
> unfortunately couldn't go through Tony's linux-omap tree due to
> dependencies on DSS driver code.
> 
> The patches are mostly aiming to get OMAP4 display support up and
> running and both HDMI and DVI outputs should now work on Blaze and Panda
> boards.
> 
> One problem I noticed just now, the committer names seem a bit messed
> up. For example, Archit Taneja has three different style names there. Do
> you think I should rebase and fix them? Not a big job, but it'll mean,
> well, rebasing.
> 
> There's a minor conflict in Overo's board file. I have pushed
> "for-paul-merged" branch to gitorious, which contains a merge with
> Linus' tree. I'm not sure that is the best way to show how to fix the
> conflict, but hopefully it'll give the idea.
> 
>  Tomi
> 
> 
> The following changes since commit a44f99c7efdb88fa41128065c9a9445c19894e34:
> 
>   Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (2011-03-20 18:14:55 -0700)
> 
> are available in the git repository at:
> 
>   git://gitorious.org/linux-omap-dss2/linux.git for-paul

I forgot to mention that this branch is based on Tony's omap-for-linus
branch, which got merged last week.

 Tomi



  reply	other threads:[~2011-03-21 13:05 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-21  9:51 [GIT PULL] omap display subsystem changes for 2.6.39 Tomi Valkeinen
2011-03-21 13:05 ` Tomi Valkeinen [this message]
2011-03-21 17:55 ` John S
2011-03-21 18:17   ` Tomi Valkeinen
2011-03-22  5:40 ` Paul Mundt
2011-03-22  5:55   ` Tomi Valkeinen
2011-03-22 18:49 ` Felipe Contreras
2011-03-23  7:46   ` Tomi Valkeinen
2011-03-28 21:07     ` Tony Lindgren

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=1300712711.2891.125.camel@deskari \
    --to=tomi.valkeinen@ti.com \
    --cc=lethal@linux-sh.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-omap@vger.kernel.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).