* linux-next: manual merge of the omap_dss2 tree
@ 2013-10-10 17:50 Mark Brown
2013-10-11 5:18 ` Tomi Valkeinen
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2013-10-10 17:50 UTC (permalink / raw)
To: Archit Taneja, Tomi Valkeinen, Ricardo Neri
Cc: linux-omap, linux-fbdev, linux-next, linux-kernel, Thierry Reding
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the omap_dss2 tree
2013-10-10 17:50 linux-next: manual merge of the omap_dss2 tree Mark Brown
@ 2013-10-11 5:18 ` Tomi Valkeinen
0 siblings, 0 replies; 4+ messages in thread
From: Tomi Valkeinen @ 2013-10-11 5:18 UTC (permalink / raw)
To: Mark Brown, Jean-Christophe PLAGNIOL-VILLARD
Cc: Archit Taneja, linux-omap, linux-fbdev, linux-next, linux-kernel,
Thierry Reding
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the omap_dss2 tree
2013-10-14 14:48 ` linux-next: manual merge of the omap_dss2 tree Thierry Reding
@ 2013-10-15 6:47 ` Tomi Valkeinen
0 siblings, 0 replies; 4+ messages in thread
From: Tomi Valkeinen @ 2013-10-15 6:47 UTC (permalink / raw)
To: Thierry Reding, Jean-Christophe PLAGNIOL-VILLARD
Cc: Archit Taneja, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
Hi,
On 14/10/13 17:48, Thierry Reding wrote:
> Today's linux-next merge of the omap_dss2 tree got conflicts in
>
> drivers/video/omap2/dss/hdmi4_core.c
> drivers/video/omap2/dss/hdmi4_core.h
>
> caused by commits ef26958 (omapdss: HDMI: Rename hdmi driver files to nicer
> names) and a few others that I didn't quite track down. But given that the
> diff of the merge commit is empty I guess everything's well.
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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the omap_dss2 tree
2013-10-14 14:48 linux-next: Tree for Oct 14 Thierry Reding
@ 2013-10-14 14:48 ` Thierry Reding
2013-10-15 6:47 ` Tomi Valkeinen
0 siblings, 1 reply; 4+ messages in thread
From: Thierry Reding @ 2013-10-14 14:48 UTC (permalink / raw)
To: Tomi Valkeinen, Archit Taneja; +Cc: linux-next, linux-kernel
Today's linux-next merge of the omap_dss2 tree got conflicts in
drivers/video/omap2/dss/hdmi4_core.c
drivers/video/omap2/dss/hdmi4_core.h
caused by commits ef26958 (omapdss: HDMI: Rename hdmi driver files to nicer
names) and a few others that I didn't quite track down. But given that the
diff of the merge commit is empty I guess everything's well.
Thanks,
Thierry
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-15 6:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-10 17:50 linux-next: manual merge of the omap_dss2 tree Mark Brown
2013-10-11 5:18 ` Tomi Valkeinen
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).