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] [day] [month] [year] [list]

Message-ID: <52578A2A.10304@ti.com>
Date:	Fri, 11 Oct 2013 08:18:34 +0300
From:	Tomi Valkeinen <tomi.valkeinen@...com>
To:	Mark Brown <broonie@...nel.org>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
CC:	Archit Taneja <archit@...com>, <linux-omap@...r.kernel.org>,
	<linux-fbdev@...r.kernel.org>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>,
	Thierry Reding <thierry.reding@...il.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree

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



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