linux-kernel - Re: linux-next: manual merge of the fbdev tree with the drm tree

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, 17 Jun 2013 10:23:01 +0300
From:	Tomi Valkeinen <tomi.valkeinen@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>,
	Dave Airlie <airlied@...ux.ie>
CC:	Florian Tobias Schandinat <FlorianSchandinat@....de>,
	<linux-fbdev@...r.kernel.org>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>,
	Steffen Trumtrar <s.trumtrar@...gutronix.de>
Subject: Re: linux-next: manual merge of the fbdev tree with the drm tree

Hi,

On 17/06/13 07:21, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the fbdev tree got a conflict in
> drivers/video/of_display_timing.c between commit f583662347c6 ("video:
> display_timing: make parameter const") from the drm tree and commits
> fcf7e6e5bd84 ("videomode: don't allocate mem in of_get_display_timing()")
> and ffa3fd21de8a ("videomode: implement public of_get_display_timing()")
> from the fbdev tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks, looks correct to me.

I guess it'd be better to merge videomode and display_timing stuff via a
single tree from this on. Being in drivers/video/, I suggest the fbdev tree.

 Tomi



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