Merge in the drm-intel tree

[Stephen Rothwell]

Hi all,

I noticed that the drm tree has been back merge into the drm-intel
tree.  Unfortunately, it seems that the file
drivers/gpu/drm/i915/i915_gem_batch_pool.c has been resurrected.

It was removed in commit

  b40d73784ffc ("drm/i915: Replace struct_mutex for batch pool serialisation")

but has come back due to a conflict with commit

  52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv")

from the drm tree.
-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20190822/fb6ccb16/attachment-0001.sig>