linux-next: manual merge of the omap_dss2 tree

linux-next: manual merge of the omap_dss2 tree

[Mark Brown]

[-- 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 --]

Re: linux-next: manual merge of the omap_dss2 tree

[Tomi Valkeinen]

[-- 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 --]

linux-next: Tree for Oct 14

[Thierry Reding]

Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

        git://gitorious.org/thierryreding/linux-next.git

A next-20131014 tag is also provided for convenience.

Gained a few conflicts, but nothing too exciting. x86 and ARM default
configurations build fine. There were some build failures unrelated to
the merge, most of which I fixed and added as patches on top of the
final merge.

Thierry

linux-next: manual merge of the omap_dss2 tree

[Thierry Reding]

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

Re: linux-next: manual merge of the omap_dss2 tree

[Tomi Valkeinen]

[-- 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 --]