From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomi Valkeinen Date: Mon, 17 Jun 2013 07:23:01 +0000 Subject: Re: linux-next: manual merge of the fbdev tree with the drm tree Message-Id: <51BEB955.1020809@ti.com> MIME-Version: 1 Content-Type: multipart/mixed; boundary="----enig2TOCMVMLBHOFPOMFKBIQW" List-Id: References: <20130617142120.b42dafb967974d3906a43fc9@canb.auug.org.au> In-Reply-To: <20130617142120.b42dafb967974d3906a43fc9@canb.auug.org.au> To: Stephen Rothwell , Jean-Christophe PLAGNIOL-VILLARD , Dave Airlie Cc: Florian Tobias Schandinat , linux-fbdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Steffen Trumtrar ------enig2TOCMVMLBHOFPOMFKBIQW Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi, On 17/06/13 07:21, Stephen Rothwell wrote: > Hi all, >=20 > 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. >=20 > 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 tr= ee. Tomi ------enig2TOCMVMLBHOFPOMFKBIQW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRvrlZAAoJEPo9qoy8lh71etgP/jsT/ZZt9o7oZFIrUadXPOVg Zi8ZUf/5/4RcWWBDhuXlYbmHOawt6LhlCGVF0tmWiNBa39DBh8HSTE6uXedZ8rlX Tf6b5kf1Je5t001Q8l98kIpgkCJT1QzQkFGK6OPvb7vhu8s+AjS//7gRUsfxmxHl wZ5BfZsYfQ7muVEyLskhLj+MCq52RddNov0gZQWBshxKVk22jYDNwqYUzgNCAnI4 24wXPSILBGVZGUBYuZXM379hYiAGGhe6WuChgm9GauNtaX4JXUeVp5WnGhkk4Dz5 E+LBgiJOLC0Khq+OkCDwkLK49Ru35oYkOVWWn+5ZV5YhiEfM2IcqBM7qLxVnt8Js 6YoJuiwUUgXbBtfkffJb5gQuwPUK6yvRHb3nxTdXhav84iVZmpz61K4ktUMLB7sR dWsI8V8JVMZg1fTQgL4ltak7kNlndtV0jHIQ39+BYjR0lFXW3UqTt/IeZLnzBokN t7UdpPaqz36UifUnrX3CV7COS3yXIr1vulKeWGP7EGO8tSTerFer/A0HN93bepdy h7540LWtvStoZof3ZTrJtBgGwSoxg1bN2vA3sLIzDh3ojwWKTnqpGc6zlOiDmpQn CXpfXwtZ22bAqL5UsIEJ2R5EI2cdDnD3dlf195Bib3ku1zXMW0aGwyRfJaUwiug0 XpwLocVAFw7rxstdXeZD =6nT8 -----END PGP SIGNATURE----- ------enig2TOCMVMLBHOFPOMFKBIQW--