linux-next: manual merge of the drm tree with the v4l-dvb tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
	Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Hans Verkuil <hans.verkuil@cisco.com>,
	Shawn Guo <shawn.guo@linaro.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree
Date: Tue, 11 Apr 2017 10:27:19 +1000	[thread overview]
Message-ID: <20170411102719.17042877@canb.auug.org.au> (raw)

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 <drm/exynos_drm.h>
  
 +#include <media/cec-notifier.h>
 +
- #include "exynos_drm_drv.h"
  #include "exynos_drm_crtc.h"
  
  #define HOTPLUG_DEBOUNCE_MS		1100
