From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
To: ext 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>,
ext Tony Lindgren <tony@atomide.com>
Subject: Re: [GIT PULL] OMAP DSS changes for .38 merge window
Date: Fri, 07 Jan 2011 14:06:56 +0000 [thread overview]
Message-ID: <1294409216.3968.97.camel@nubuntu> (raw)
In-Reply-To: <20110107135217.GA3760@linux-sh.org>
On Fri, 2011-01-07 at 22:52 +0900, ext Paul Mundt wrote:
> Hmm, I've just fast-forwarded to Linus's current tree and tried to pull
> your rebase branch in, but it seems to have a board conflict with the
> OMAP tree merge:
>
> CONFLICT (delete/modify): arch/arm/mach-omap2/board-zoom2.c deleted in HEAD and modified in 122ffebf2191529153c079b457e38ca3829eac40. Version 122ffebf2191529153c079b457e38ca3829eac40 of arch/arm/mach-omap2/board-zoom2.c left in tree.
>
> Additionally there's a board-zoom.c conflict that looks like this:
Ah. I'll have to fix that. Let's leave this until Monday, as I don't
have a board here to test the fixes.
Tomi
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
To: ext 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>,
ext Tony Lindgren <tony@atomide.com>
Subject: Re: [GIT PULL] OMAP DSS changes for .38 merge window
Date: Fri, 07 Jan 2011 16:06:56 +0200 [thread overview]
Message-ID: <1294409216.3968.97.camel@nubuntu> (raw)
In-Reply-To: <20110107135217.GA3760@linux-sh.org>
On Fri, 2011-01-07 at 22:52 +0900, ext Paul Mundt wrote:
> Hmm, I've just fast-forwarded to Linus's current tree and tried to pull
> your rebase branch in, but it seems to have a board conflict with the
> OMAP tree merge:
>
> CONFLICT (delete/modify): arch/arm/mach-omap2/board-zoom2.c deleted in HEAD and modified in 122ffebf2191529153c079b457e38ca3829eac40. Version 122ffebf2191529153c079b457e38ca3829eac40 of arch/arm/mach-omap2/board-zoom2.c left in tree.
>
> Additionally there's a board-zoom.c conflict that looks like this:
Ah. I'll have to fix that. Let's leave this until Monday, as I don't
have a board here to test the fixes.
Tomi
next prev parent reply other threads:[~2011-01-07 14:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-07 12:41 [GIT PULL] OMAP DSS changes for .38 merge window Tomi Valkeinen
2011-01-07 12:41 ` Tomi Valkeinen
2011-01-07 13:25 ` Paul Mundt
2011-01-07 13:25 ` Paul Mundt
2011-01-07 13:37 ` Tomi Valkeinen
2011-01-07 13:37 ` Tomi Valkeinen
2011-01-07 13:52 ` Paul Mundt
2011-01-07 13:52 ` Paul Mundt
2011-01-07 14:06 ` Tomi Valkeinen [this message]
2011-01-07 14:06 ` Tomi Valkeinen
2011-01-10 9:51 ` [GIT PULL] OMAP DSS changes for .38 merge window v2 Tomi Valkeinen
2011-01-10 9:51 ` Tomi Valkeinen
2011-01-11 3:00 ` Paul Mundt
2011-01-11 3:00 ` Paul Mundt
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=1294409216.3968.97.camel@nubuntu \
--to=tomi.valkeinen@nokia.com \
--cc=lethal@linux-sh.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.