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

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/i915/i915_driver.c

between commit:

  2293a73ad4f3 ("drm/i915: Remove unused variable")

from Linus' tree and commit:

  e5e43d3363d7 ("drm/i915/display: Pass drm_i915_private as param to i915 funcs")

from the drm-intel tree.

I fixed it up (the latter commit means that the variable removed in
the former is still needed - 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/gpu/drm/i915/i915_driver.c
index cf1c0970ecb4,4a2dc43791c3..000000000000
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@@ -936,9 -930,12 +930,11 @@@ static int i915_driver_open(struct drm_
   */
  static void i915_driver_lastclose(struct drm_device *dev)
  {
- 	intel_fbdev_restore_mode(dev);
+ 	struct drm_i915_private *i915 = to_i915(dev);
+ 
+ 	intel_fbdev_restore_mode(i915);
  
 -	if (HAS_DISPLAY(i915))
 -		vga_switcheroo_process_delayed_switch();
 +	vga_switcheroo_process_delayed_switch();
  }
  
  static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)

Attachment: pgpTcCxe0YV4c.pgp
Description: OpenPGP digital signature