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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/gpu/drm/i915/i915_drv.c

between commit:

  55ac5a1614f9 ("drm/i915: Attach the pci match data to the device upon creation")

from the drm tree and commit:

  1feb64c49d7f ("drm/i915: Clear DRIVER_ATOMIC on a per-device basis")

from the drm-misc 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/i915_drv.c
index 5dd7fc582e6f,61199defb470..000000000000
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -1384,14 -1336,22 +1384,14 @@@ int i915_driver_load(struct pci_dev *pd
  	struct drm_i915_private *dev_priv;
  	int ret;
  
- 	/* Enable nuclear pageflip on ILK+ */
- 	if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
- 		driver.driver_features &= ~DRIVER_ATOMIC;
 -	ret = -ENOMEM;
 -	dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
 -	if (dev_priv)
 -		ret = drm_dev_init(&dev_priv->drm, &driver, &pdev->dev);
 -	if (ret) {
 -		DRM_DEV_ERROR(&pdev->dev, "allocation failed\n");
 -		goto out_free;
 -	}
--
 -	dev_priv->drm.pdev = pdev;
 -	dev_priv->drm.dev_private = dev_priv;
 +	dev_priv = i915_driver_create(pdev, ent);
 +	if (!dev_priv)
 +		return -ENOMEM;
  
+ 	/* Disable nuclear pageflip by default on pre-ILK */
+ 	if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
+ 		dev_priv->drm.driver_features &= ~DRIVER_ATOMIC;
+ 
  	ret = pci_enable_device(pdev);
  	if (ret)
  		goto out_fini;

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