From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Benoit Cousson <b-cousson@ti.com>,
Mayuresh Janorkar <mayur@ti.com>,
Senthilvadivu Guruswamy <svadivu@ti.com>,
Sumit Semwal <sumit.semwal@ti.com>
Subject: linux-next: manual merge of the omap_dss2 tree with the tree
Date: Fri, 18 Feb 2011 13:19:38 +1100 [thread overview]
Message-ID: <20110218131938.d7b27a31.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_44xx_data.c between commit
d63bd74fbb5fb2161d9cb90cd7a93a2c5db47c63 ("OMAP4: hwmod data: Add DSS,
DISPC, DSI1&2, RFBI, HDMI and VENC") from the omap tree and commit
cb93d0b00acd5e5ada8ddd4c8719d4aa390515d2 ("OMAP4: hwmod data: add DSS
DISPC DSI1,2 RFBI HDMI VENC") from the omap_dss2 tree.
So these two commits with essentially the same commit messages and author
dates are quite different :-(. I used the version from the omap tree.
Please sort this out.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-02-18 2:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-18 2:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-24 3:23 linux-next: manual merge of the omap_dss2 tree with the tree Stephen Rothwell
2011-02-24 8:52 ` 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=20110218131938.d7b27a31.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=b-cousson@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mayur@ti.com \
--cc=sumit.semwal@ti.com \
--cc=svadivu@ti.com \
--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