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

[Mark Brown]

Hi all,

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

  drivers/accel/ethosu/ethosu_drv.c

between commit:

  17cdb54644e7d ("accel: ethosu: Add performance counter support")

from the origin tree and commit:

  7ab64476a610f ("accel/ethosu: check MMIO mapping errors in probe")

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

diff --cc drivers/accel/ethosu/ethosu_drv.c
index d121fb0d77328,b2901eb8a7a03..0000000000000
--- a/drivers/accel/ethosu/ethosu_drv.c
+++ b/drivers/accel/ethosu/ethosu_drv.c
@@@ -356,7 -342,8 +356,9 @@@ static int ethosu_probe(struct platform
  	dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40));
  
  	ethosudev->regs = devm_platform_ioremap_resource(pdev, 0);
 +	ethosudev->pmu_regs = ethosudev->regs;
+ 	if (IS_ERR(ethosudev->regs))
+ 		return PTR_ERR(ethosudev->regs);
  
  	ethosudev->num_clks = devm_clk_bulk_get_all(&pdev->dev, &ethosudev->clks);
  	if (ethosudev->num_clks < 0)

Attachment: signature.asc
Description: PGP signature