On Thu, 9 Sept 2021 at 19:30, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > > On Thu, Sep 9, 2021 at 5:35 AM Dave Airlie <airlied@xxxxxxxxx> wrote: > > > > On Thu, 9 Sept 2021 at 03:44, Thomas Zimmermann <tzimmermann@xxxxxxx> wrote: > > > > > > Hi Dave and Daniel, > > > > > > here's this week's PR for drm-misc-fixes. One patch is a potential deadlock > > > in TTM, the other enables an additional plane in kmb. I'm slightly unhappy > > > that the latter one ended up in -fixes as it's not a bugfix AFAICT. > > > > To avoid messy merge window, I'm not pulling this until after rc1 > > unless there is some major reason? > > Christian misplaced a ttm fix, so we really want this. Maybe > cherry-pick to drm-next and then drm-misc-fixes gets rebased instead. > > And yeah I dunno what do with our conflicts around merge window, maybe > we're letting trees diverge a bit too much. I've cherry-pick the ttm fix, the kmb fix should be somewhere else, I'm not going to pull it in from there. Maybe once rc1 gets out it can be rebased. Please nobody push to drm-misc-fixes until post rc1 + a day or two. Dave.
