From: Mark Brown <broonie@kernel.org>
To: Archit Taneja <archit@ti.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
Ricardo Neri <ricardo.neri@ti.com>
Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thierry Reding <thierry.reding@gmail.com>
Subject: linux-next: manual merge of the omap_dss2 tree
Date: Thu, 10 Oct 2013 18:50:20 +0100 [thread overview]
Message-ID: <20131010175020.GS21581@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
Today's linux-next merge of the omap_dss2 tree got conflicts in
drivers/video/omap2/dss/hdmi4_core.[ch] caused by ef26958a (omapdss:
HDMI: Rename hdmi driver files to nicer names) interacting with a range
of commits from Ricardo Neri in the fbdev tree and possibly some other
stuff. git is unfortunately not giving me a useful diff right now :/
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-10-10 17:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-10 17:50 Mark Brown [this message]
2013-10-11 5:18 ` linux-next: manual merge of the omap_dss2 tree Tomi Valkeinen
-- strict thread matches above, loose matches on Subject: below --
2013-10-14 14:48 linux-next: Tree for Oct 14 Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the omap_dss2 tree Thierry Reding
2013-10-15 6:47 ` 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=20131010175020.GS21581@sirena.org.uk \
--to=broonie@kernel.org \
--cc=archit@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=ricardo.neri@ti.com \
--cc=thierry.reding@gmail.com \
--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