[Intel-gfx] [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
Daniel Vetter
daniel at ffwll.ch
Wed May 19 10:14:57 UTC 2021
On Wed, May 19, 2021 at 11:49:32AM +0300, Jani Nikula wrote:
> We've had a stale repo for amd in drm-tip since around v4.15 i.e. for
> more than three years. Nobody seems to notice or care. Drop the amd
> branches from drm-tip.
>
> Having the current amd branches in drm-tip would be nice to have, if
> only to have a common drm integration tree. However, maintaining that
> has a cost due to the inevitable conflicts. We can add the branches back
> if and when there's interest in sharing the burden.
>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Cc: Christian König <christian.koenig at amd.com>
> Cc: Pan, Xinhui <Xinhui.Pan at amd.com>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> nightly.conf | 9 ---------
> 1 file changed, 9 deletions(-)
>
> diff --git a/nightly.conf b/nightly.conf
> index 9211550ef75c..35fb1d9ba600 100644
> --- a/nightly.conf
> +++ b/nightly.conf
> @@ -40,12 +40,6 @@ git://anongit.freedesktop.org/drm-misc
> https://anongit.freedesktop.org/git/drm/drm-misc
> https://anongit.freedesktop.org/git/drm/drm-misc.git
> "
> -drm_tip_repos[drm-amd]="
> -ssh://git.freedesktop.org/git/drm/drm-amd
> -git://anongit.freedesktop.org/drm/drm-amd
> -https://anongit.freedesktop.org/git/drm/drm-amd
> -https://anongit.freedesktop.org/git/drm/drm-amd.git
> -"
> drm_tip_repos[drm]="
> ssh://git.freedesktop.org/git/drm/drm
> git://anongit.freedesktop.org/drm/drm
> @@ -76,17 +70,14 @@ drm_tip_config=(
> "drm drm-fixes"
> "drm-misc drm-misc-fixes"
> "drm-intel drm-intel-fixes"
> - "drm-amd drm-amd-fixes"
>
> "drm drm-next"
> "drm-misc drm-misc-next-fixes"
> "drm-intel drm-intel-next-fixes"
> - "drm-amd drm-amd-next-fixes"
>
> "drm-misc drm-misc-next"
> "drm-intel drm-intel-next"
> "drm-intel drm-intel-gt-next"
> - "drm-amd drm-amd-next"
>
> "sound-upstream for-linus"
> "sound-upstream for-next"
> --
> 2.20.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
More information about the Intel-gfx
mailing list