From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753489AbdDKA1X (ORCPT ); Mon, 10 Apr 2017 20:27:23 -0400 Received: from ozlabs.org ([103.22.144.67]:53793 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752187AbdDKA1V (ORCPT ); Mon, 10 Apr 2017 20:27:21 -0400 Date: Tue, 11 Apr 2017 10:27:19 +1000 From: Stephen Rothwell To: Dave Airlie , Mauro Carvalho Chehab Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Hans Verkuil , Shawn Guo , Daniel Vetter Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree Message-ID: <20170411102719.17042877@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/exynos/exynos_hdmi.c between commit: 278c811c5d05 ("[media] exynos_hdmi: add CEC notifier support") from the v4l-dvb tree and commit: 64b0e1d6c6a1 ("drm: exynos: use vblank hooks in struct drm_crtc_funcs") 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/exynos/exynos_hdmi.c index bc4c8d0a66f4,52438404c8c9..000000000000 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@@ -43,9 -43,6 +43,8 @@@ #include +#include + - #include "exynos_drm_drv.h" #include "exynos_drm_crtc.h" #define HOTPLUG_DEBOUNCE_MS 1100