linux-kernel - Re: linux-next: manual merge of the omap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <525CE50F.9090801@ti.com>
Date:	Tue, 15 Oct 2013 09:47:43 +0300
From:	Tomi Valkeinen <tomi.valkeinen@...com>
To:	Thierry Reding <thierry.reding@...il.com>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
CC:	Archit Taneja <archit@...com>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the omap_dss2 tree

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



Download attachment "signature.asc" of type "application/pgp-signature" (902 bytes)