Re: Merge in the drm-intel tree

2019-08-22 Thread Vivi, Rodrigo
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 wrote: > > Hi all, > > I noticed that the drm tree has been back merge into the drm-intel > tree. Unfortunately, it seems

Merge in the drm-intel tree

2019-08-22 Thread 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 ha