On Wed, Aug 26, 2020 at 12:02 PM Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> wrote: > > On Thu, 20 Aug 2020, Maxime Ripard <maxime@xxxxxxxxxx> wrote: > > This PR diffstat is pretty massive since we merged 5.9-rc1 and it's not (yet?) in drm-next. > > > > I'm not entirely sure how to tackle this (if it causes an issue?). > > > > Let me know, thanks! > > Whatever Dave & Daniel say, but previously the rule of thumb has been to > only ever do backmerges from drm-next. If you need a backmerge from > Linus' tree, you ask for a backmerge to drm-next, and then backmerge > that. Yup. drm-misc docs even say that if you roll forward (or backmerge) before it's in drm.git it's going to be a bit of a mess. -Daniel > > BR, > Jani. > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
