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

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

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

Hi all,

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

  drivers/gpu/drm/pl111/pl111_drv.c

between commit:

  0ddd3bb4b14c ("drm/pl111: Fix error handling in pl111_amba_probe")

from the drm-misc-fixes tree and commit:

  a1542b8ca6ed ("drm: pl111: replace dev_* print functions with drm_* variants")

from the drm 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/pl111/pl111_drv.c
index d7dc83cf7b00,ac9e4b6bd2eb..000000000000
--- a/drivers/gpu/drm/pl111/pl111_drv.c
+++ b/drivers/gpu/drm/pl111/pl111_drv.c
@@@ -294,8 -295,8 +295,8 @@@ static int pl111_amba_probe(struct amba
  	ret = devm_request_irq(dev, amba_dev->irq[0], pl111_irq, 0,
  			       variant->name, priv);
  	if (ret != 0) {
- 		dev_err(dev, "%s failed irq %d\n", __func__, ret);
+ 		drm_err(drm, "%s failed irq %d\n", __func__, ret);
 -		return ret;
 +		goto dev_put;
  	}
  
  	ret = pl111_modeset_init(drm);

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