From: Paul Mundt <lethal@linux-sh.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Archit Taneja <archit@ti.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the fbdev-current tree
Date: Tue, 19 Apr 2011 16:01:14 +0900 [thread overview]
Message-ID: <20110419070114.GA7582@linux-sh.org> (raw)
In-Reply-To: <20110419132720.d86b8afd.sfr@canb.auug.org.au>
On Tue, Apr 19, 2011 at 01:27:20PM +1000, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/omap2/dss/dss_features.c
> drivers/video/omap2/dss/dss_features.h between commit 0b41136c0d2f
> ("OMAP: DSS2: DSI: Fix DSI PLL power bug") from the fbdev-current tree
> and commit 0f7d043bd56b ("OMAP4: DSS2: Register configuration changes for
> DSI") from the omap_dss2 tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Hmm, both changes came from the omap_dss2 tree, I wonder what's going on?
next prev parent reply other threads:[~2011-04-19 7:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-19 3:27 linux-next: manual merge of the omap_dss2 tree with the fbdev-current tree Stephen Rothwell
2011-04-19 7:01 ` Paul Mundt [this message]
2011-04-19 7:03 ` Tomi Valkeinen
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=20110419070114.GA7582@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=archit@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tomi.valkeinen@ti.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