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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_fb.c between commit b72447cdf129 ("drm/i915:
Drop bogus fbdev sprite disable code") from the drm tree and commit
b51b32cde175 ("drm/i915: s/drm_i915_private_t/struct drm_i915_private/")
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@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/i915/intel_fb.c
index 3b03c3c,244060a..0000000
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@@ -291,7 -292,9 +292,7 @@@ void intel_fb_output_poll_changed(struc
  void intel_fb_restore_mode(struct drm_device *dev)
  {
  	int ret;
- 	drm_i915_private_t *dev_priv = dev->dev_private;
+ 	struct drm_i915_private *dev_priv = dev->dev_private;
 -	struct drm_mode_config *config = &dev->mode_config;
 -	struct drm_plane *plane;
  
  	if (INTEL_INFO(dev)->num_pipes == 0)
  		return;

Attachment: pgp00000.pgp
Description: PGP signature