linux-next: manual merge of the amlogic tree with the FIXME tree

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/meson/meson_drv.c

between commit:

  66620f48cb59440 ("drm/meson: drop use of drmP.h")

from Linus' tree and commit:

  e478e0ba4ffec31 ("drm/meson: enable runtime PM")

from the amlogic 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.

diff --cc drivers/gpu/drm/meson/meson_drv.c
index a24f8dec5adc9,256b6a0e9c6b2..0000000000000
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@@ -8,30 -8,36 +8,31 @@@
   *     Jasper St. Pierre <jstpierre@xxxxxxxxxxx>
   */
  
 -#include <linux/kernel.h>
 -#include <linux/module.h>
 -#include <linux/mutex.h>
 -#include <linux/platform_device.h>
  #include <linux/component.h>
 +#include <linux/module.h>
  #include <linux/of_graph.h>
 +#include <linux/platform_device.h>
+ #include <linux/pm_runtime.h>
 +#include <linux/soc/amlogic/meson-canvas.h>
  
 -#include <drm/drmP.h>
 -#include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
 -#include <drm/drm_fb_cma_helper.h>
 +#include <drm/drm_drv.h>
  #include <drm/drm_fb_helper.h>
 -#include <drm/drm_flip_work.h>
  #include <drm/drm_gem_cma_helper.h>
  #include <drm/drm_gem_framebuffer_helper.h>
 -#include <drm/drm_plane_helper.h>
 +#include <drm/drm_irq.h>
 +#include <drm/drm_modeset_helper_vtables.h>
  #include <drm/drm_probe_helper.h>
 -#include <drm/drm_rect.h>
 +#include <drm/drm_vblank.h>
  
 +#include "meson_crtc.h"
  #include "meson_drv.h"
 -#include "meson_plane.h"
  #include "meson_overlay.h"
 -#include "meson_crtc.h"
 +#include "meson_plane.h"
 +#include "meson_registers.h"
  #include "meson_venc_cvbs.h"
 -
 -#include "meson_vpp.h"
  #include "meson_viu.h"
 -#include "meson_venc.h"
 -#include "meson_registers.h"
 +#include "meson_vpp.h"
  
  #define DRIVER_NAME "meson"
  #define DRIVER_DESC "Amlogic Meson DRM driver"

Attachment: signature.asc
Description: PGP signature