On Tue, 12 Jan 2021, "Vivi, Rodrigo" <rodrigo.vivi@xxxxxxxxx> wrote: > On Mon, 2021-01-11 at 13:25 -0800, Lucas De Marchi wrote: >> last time we talked about this was regarding dg1 AFAIR and the >> consensus was to create a topic branch and that topic branch to be >> merged in both branches. That would avoid having 2 commits in >> different branches. > > Yeap, I believe this is the way to go. > >> >> Not sure if it would work out nicely for getting test on CI though. > > create an empty topic branch using dim. > > Pre-merge CI with drm-tip. Only if passing and if everything is realy > ready. Push to the topic branch using dim. > > Then it will be part of drm-tip already for any subsequential pre-merge > CI... > > Then do the pull requests to bot drm-intel-next and drm-intel-gt-next. > > After everything is pulled to both places, then delete the topic > branch. Atm the problem is this: $ git merge-base drm-intel/drm-intel-next drm-intel/drm-intel-gt-next That would be the baseline for the topic branch. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
