From: Qiang Yu <yuq825@xxxxxxxxx> Upstream has reverted the dependant commit df622729ddbf ("drm/scheduler: track GPU active time per entity""), but this patchset has been pushed to drm-misc-next which still has that commit. To avoid other branch build fail after merge drm-misc-next, just revert the lima patchset on drm-misc-next too. Qiang Yu (3): Revert "drm/lima: add show_fdinfo for drm usage stats" Revert "drm/lima: allocate unique id per drm_file" Revert "drm/lima: add usage counting method to ctx_mgr" drivers/gpu/drm/lima/lima_ctx.c | 30 +-------------------- drivers/gpu/drm/lima/lima_ctx.h | 3 --- drivers/gpu/drm/lima/lima_device.h | 3 --- drivers/gpu/drm/lima/lima_drv.c | 43 +----------------------------- drivers/gpu/drm/lima/lima_drv.h | 1 - 5 files changed, 2 insertions(+), 78 deletions(-) -- 2.25.1