Message ID | 20200820125644.hee2jjtnef5bf74o@gilmour.lan (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [PULL] drm-misc-next | expand |
On Wed, Aug 26, 2020 at 12:02 PM Jani Nikula <jani.nikula@linux.intel.com> wrote: > > On Thu, 20 Aug 2020, Maxime Ripard <maxime@cerno.tech> 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