From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751517AbdLMX7z (ORCPT ); Wed, 13 Dec 2017 18:59:55 -0500 Received: from ozlabs.org ([103.22.144.67]:56165 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751305AbdLMX7x (ORCPT ); Wed, 13 Dec 2017 18:59:53 -0500 Date: Thu, 14 Dec 2017 10:59:50 +1100 From: Stephen Rothwell To: Dave Airlie , DRI , Daniel Vetter , Intel Graphics Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Keith Packard , Jani Nikula Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20171214105950.5eca33b2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_edid.c between commit: 4b4df570b41d ("drm: Update edid-derived drm_display_info fields at edid property set [v2]") from the drm-misc-fixes tree and commit: c945b8c14bb7 ("drm/edid: build ELD in drm_add_edid_modes()") from the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/drm_edid.c index cb487148359a,524eace3d460..000000000000 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@@ -4653,6 -4645,10 +4671,8 @@@ int drm_add_edid_modes(struct drm_conne return 0; } - quirks = edid_get_quirks(edid); - + drm_edid_to_eld(connector, edid); + /* * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks. * To avoid multiple parsing of same block, lets parse that map