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]

Date:	Mon, 23 Sep 2013 10:30:43 +0300
From:	Tomi Valkeinen <tomi.valkeinen@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Jingoo Han <jg1.han@...sung.com>,
	Florian Tobias Schandinat <FlorianSchandinat@....de>,
	<linux-fbdev@...r.kernel.org>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the fbdev
 tree

Hi Stephen, Jean-Christophe,

On 23/09/13 05:28, Stephen Rothwell wrote:
> Hi Tomi,
> 
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/atmel_lcdfb.c between commits a17c2e7b704f ("video:
> atmel_lcdfb: fix platform data struct") and 5e8be022fb5b ("video:
> atmel_lcdfb: add device tree suport") from the fbdev tree and commit
> a5d58be0796a ("video: atmel_lcdfb: use dev_get_platdata()") from the
> omap_dss2 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Jean-Christophe's tree seems to contain some old commits, never pushed
to mainline. Jean-Christophe, can you reset your for-next branch?

 Tomi



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