Outch, it reapared on the backmerge I did yesterday and I didn't noticed. Sorry
Chris has fixed this now. Thank you both. > On Aug 22, 2019, at 3:20 AM, Stephen Rothwell <[email protected]> wrote: > > 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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
