[rerere PATCH] nightly.conf: Merge drm-msm trees into drm-tip

[Dmitry Baryshkov]

On Thu, Jun 27, 2024 at 09:26:19PM GMT, Jani Nikula wrote:
> On Thu, 27 Jun 2024, Jani Nikula <jani.nikula at linux.intel.com> wrote:
> > On Wed, 26 Jun 2024, Dmitry Baryshkov <dmitry.baryshkov at linaro.org> wrote:
> >> In order to improve testing of drm/msm branches, add drm-msm trees to
> >> the list of the trees to be merged into drm-tip.
> >>
> >> Cc: Rob Clark <robdclark at gmail.com>
> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> >
> > It also helps in avoiding conflicts!
> >
> > Acked-by: Jani Nikula <jani.nikula at intel.com>
> 
> Oh, this is with the assumption that you'll also maintain the branches
> with dim. I realized this was not spelled out, but I'm hoping it is the
> case.

No, we use gitlab MRs in order to be able to pre-test patches. But it
doesn't stop anybody from running dim ub && dim push after merging an
MR.

> 
> BR,
> Jani.
> 
> 
> >
> >> ---
> >>  nightly.conf | 8 ++++++++
> >>  1 file changed, 8 insertions(+)
> >>
> >> diff --git a/nightly.conf b/nightly.conf
> >> index 49abf3fb2a72..f2e181aa29e2 100644
> >> --- a/nightly.conf
> >> +++ b/nightly.conf
> >> @@ -47,6 +47,11 @@ git://anongit.freedesktop.org/drm-intel
> >>  https://anongit.freedesktop.org/git/drm/drm-intel
> >>  https://anongit.freedesktop.org/git/drm/drm-intel.git
> >>  "
> >> +drm_tip_repos[drm-msm]="
> >> +git at gitlab.freedesktop.org:drm/msm.git
> >> +https://gitlab.freedesktop.org/drm/msm.git
> >> +ssh://git@gitlab.freedesktop.org/drm/msm.git
> >> +"
> >>  drm_tip_repos[drm-misc]="
> >>  git at gitlab.freedesktop.org:drm/misc/kernel.git
> >>  https://gitlab.freedesktop.org/drm/misc/kernel.git
> >> @@ -91,16 +96,19 @@ drm_tip_config=(
> >>  	"drm-misc		drm-misc-fixes"
> >>  	"drm-intel		drm-intel-fixes"
> >>  	"drm-xe			drm-xe-fixes"
> >> +	"drm-msm		msm-fixes"
> >>  
> >>  	"drm			drm-next"
> >>  	"drm-misc		drm-misc-next-fixes"
> >>  	"drm-intel		drm-intel-next-fixes"
> >>  	"drm-xe			drm-xe-next-fixes"
> >> +	#no msm-next-fixes in drm-msm
> >>  
> >>  	"drm-misc		drm-misc-next"
> >>  	"drm-intel		drm-intel-next"
> >>  	"drm-intel		drm-intel-gt-next"
> >>  	"drm-xe			drm-xe-next"
> >> +	"drm-msm		msm-next"
> >>  
> >>  	"drm-intel		topic/core-for-CI"
> >>  	"drm-xe			topic/xe-for-CI"
> 
> -- 
> Jani Nikula, Intel

-- 
With best wishes
Dmitry