Merge in the drm-intel tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Attachment: pgpaOLItzfh33.pgp
Description: OpenPGP digital signature

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux