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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 13 Jul 2016 12:25:14 +1000

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/media/platform/omap/omap_voutdef.h

between commit:

  77430f0396af ("[media] omap_vout: use control framework")

from the v4l-dvb tree and commit:

  781a162244a2 ("[media] omap_vout: Switch to use the video/omapfb_dss.h header file")

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/media/platform/omap/omap_voutdef.h
index 49de1475e473,94b5d65afb19..000000000000
--- a/drivers/media/platform/omap/omap_voutdef.h
+++ b/drivers/media/platform/omap/omap_voutdef.h
@@@ -11,8 -11,7 +11,8 @@@
  #ifndef OMAP_VOUTDEF_H
  #define OMAP_VOUTDEF_H
  
 +#include <media/v4l2-ctrls.h>
- #include <video/omapdss.h>
+ #include <video/omapfb_dss.h>
  #include <video/omapvrfb.h>
  
  #define YUYV_BPP        2