linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Chris Wilson <chris@chris-wilson.co.uk>,
	David Weinehall <david.weinehall@linux.intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
Date: Fri, 10 Jul 2015 12:08:55 +1000	[thread overview]
Message-ID: <20150710120855.5ab5aae2@canb.auug.org.au> (raw)

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

Hi all,

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

  drivers/gpu/drm/i915/i915_drv.h

between commit:

  8146ba1637a7 ("drm/i915: Store device pointer in contexts for late tracepoint usafe")

from the drm-intel-fixes tree and commit:

  b1b38278e12b ("drm/i915: add a context parameter to {en, dis}able zero address mapping")

from the drm-intel 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/i915_drv.h
index 580762001f31,52d07fbd9cc8..000000000000

--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -826,7 -866,7 +866,8 @@@ struct intel_context 
  	struct kref ref;
  	int user_handle;
  	uint8_t remap_slice;
 +	struct drm_i915_private *i915;
+ 	int flags;
  	struct drm_i915_file_private *file_priv;
  	struct i915_ctx_hang_stats hang_stats;
  	struct i915_hw_ppgtt *ppgtt;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
