linux-next: manual merge of the drm tree with Linus' tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Shobhit Kumar <shobhit.kumar@intel.com>,
	Paulo Zanoni <paulo.r.zanoni@intel.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the drm tree with Linus' tree
Date: Thu, 4 Oct 2012 12:00:58 +1000	[thread overview]
Message-ID: <20121004120058.eb3a528381256654ffa36ce8@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1977 bytes --]

Hi Dave,

Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/i915/intel_dp.c and drivers/gpu/drm/i915/intel_drv.h
between commit 760285e7e7ab ("UAPI: (Scripted) Convert #include "..." to
#include <path/...> in drivers/gpu/") from Linus' tree and commit 54d63ca6605d
("drm/i915: Move DP structs to shared location") from the drm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_dp.c
index f1bd4f4,1474f84..0000000

--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -28,16 -28,15 +28,14 @@@
  #include <linux/i2c.h>
  #include <linux/slab.h>
  #include <linux/export.h>
 -#include "drmP.h"
 -#include "drm.h"
 -#include "drm_crtc.h"
 -#include "drm_crtc_helper.h"
 -#include "drm_edid.h"
 +#include <drm/drmP.h>
 +#include <drm/drm_crtc.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_edid.h>
  #include "intel_drv.h"
 -#include "i915_drm.h"
 +#include <drm/i915_drm.h>
  #include "i915_drv.h"
- #include <drm/drm_dp_helper.h>
  
- #define DP_RECEIVER_CAP_SIZE	0xf
  #define DP_LINK_STATUS_SIZE	6
  #define DP_LINK_CHECK_TIMEOUT	(10 * 1000)
  
diff --cc drivers/gpu/drm/i915/intel_drv.h
index 7db8490,351fd71..0000000
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -26,11 -26,12 +26,12 @@@
  #define __INTEL_DRV_H__
  
  #include <linux/i2c.h>
 -#include "i915_drm.h"
 +#include <drm/i915_drm.h>
  #include "i915_drv.h"
 -#include "drm_crtc.h"
 -#include "drm_crtc_helper.h"
 -#include "drm_fb_helper.h"
 -#include "drm_dp_helper.h"
 +#include <drm/drm_crtc.h>
 +#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_fb_helper.h>
++#include <drm/drm_dp_helper.h>
  
  #define _wait_for(COND, MS, W) ({ \
  	unsigned long timeout__ = jiffies + msecs_to_jiffies(MS);	\

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
