From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Mark Brown <broonie@kernel.org>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Archit Taneja <archit@ti.com>,
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: Re: linux-next: manual merge of the omap_dss2 tree
Date: Fri, 11 Oct 2013 05:18:34 +0000 [thread overview]
Message-ID: <52578A2A.10304@ti.com> (raw)
In-Reply-To: <20131010175020.GS21581@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
Hi Mark, Jean-Christophe,
On 10/10/13 20:50, Mark Brown wrote:
> 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 :/
Jean-Christophe has slightly different versions of my patches in his
fbdev for-next branch, so they conflict with my updated versions.
Jean-Christophe, I expected this to happen with the current way of you
having a copy of my for-next branch in yours. Can I now take your
atmel_lcdfb patches to my for-next, and you'll remove all patches from
your for-next?
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Mark Brown <broonie@kernel.org>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Archit Taneja <archit@ti.com>,
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: Re: linux-next: manual merge of the omap_dss2 tree
Date: Fri, 11 Oct 2013 08:18:34 +0300 [thread overview]
Message-ID: <52578A2A.10304@ti.com> (raw)
In-Reply-To: <20131010175020.GS21581@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
Hi Mark, Jean-Christophe,
On 10/10/13 20:50, Mark Brown wrote:
> 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 :/
Jean-Christophe has slightly different versions of my patches in his
fbdev for-next branch, so they conflict with my updated versions.
Jean-Christophe, I expected this to happen with the current way of you
having a copy of my for-next branch in yours. Can I now take your
atmel_lcdfb patches to my for-next, and you'll remove all patches from
your for-next?
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Mark Brown <broonie@kernel.org>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Archit Taneja <archit@ti.com>, <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: Re: linux-next: manual merge of the omap_dss2 tree
Date: Fri, 11 Oct 2013 08:18:34 +0300 [thread overview]
Message-ID: <52578A2A.10304@ti.com> (raw)
In-Reply-To: <20131010175020.GS21581@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
Hi Mark, Jean-Christophe,
On 10/10/13 20:50, Mark Brown wrote:
> 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 :/
Jean-Christophe has slightly different versions of my patches in his
fbdev for-next branch, so they conflict with my updated versions.
Jean-Christophe, I expected this to happen with the current way of you
having a copy of my for-next branch in yours. Can I now take your
atmel_lcdfb patches to my for-next, and you'll remove all patches from
your for-next?
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
next prev parent reply other threads:[~2013-10-11 5:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-10 17:50 linux-next: manual merge of the omap_dss2 tree Mark Brown
2013-10-10 17:50 ` Mark Brown
2013-10-11 5:18 ` Tomi Valkeinen [this message]
2013-10-11 5:18 ` Tomi Valkeinen
2013-10-11 5:18 ` 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
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=52578A2A.10304@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=archit@ti.com \
--cc=broonie@kernel.org \
--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=plagnioj@jcrosoft.com \
--cc=thierry.reding@gmail.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.