On Wed, Apr 05, 2023 at 08:50:06AM +0800, Qiang Yu wrote: > Applied to drm-misc-next, sorry for the trouble. No worries, I already complained to Lucas/etnaviv people that the sched revert should have been at least posted/discussed on dri-devel. Imo this isn't on you. -Daniel > > Regards, > Qiang > > On Wed, Apr 5, 2023 at 3:28 AM Daniel Vetter <daniel@xxxxxxxx> wrote: > > > > On Tue, Apr 04, 2023 at 04:17:33PM +0100, Emil Velikov wrote: > > > On Tue, 4 Apr 2023 at 08:13, <yq882255@xxxxxxx> wrote: > > > > > > > > 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. > > > > > > > > > > The bug/revert is unfortunate, although we better keep the build clean > > > or Linus will go bananas ^_^ > > > > > > Fwiw for the series: > > > Acked-by: Emil Velikov <emil.l.velikov@xxxxxxxxx> > > > > Can you (eitehr of you really) please push asap and make sure this doesn't > > miss the last drm-misc-next pull (-rc6 is this w/e)? Otherwise we'll have > > a bit a mess. > > -Daniel > > > > > > > > HTH > > > -Emil > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch