* [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
@ 2021-05-19 8:49 ` Jani Nikula
0 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2021-05-19 8:49 UTC (permalink / raw)
To: dim-tools
Cc: jani.nikula, Daniel Vetter, intel-gfx, Xinhui, dri-devel,
Alex Deucher, Christian König, Pan
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@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
2021-05-19 8:49 ` Jani Nikula
@ 2021-05-19 10:14 ` Daniel Vetter
-1 siblings, 0 replies; 11+ messages in thread
From: Daniel Vetter @ 2021-05-19 10:14 UTC (permalink / raw)
To: Jani Nikula
Cc: dim-tools, Daniel Vetter, intel-gfx, Xinhui, dri-devel,
Alex Deucher, Christian König, Pan
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@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
@ 2021-05-19 10:14 ` Daniel Vetter
0 siblings, 0 replies; 11+ messages in thread
From: Daniel Vetter @ 2021-05-19 10:14 UTC (permalink / raw)
To: Jani Nikula
Cc: dim-tools, Daniel Vetter, intel-gfx, Xinhui, dri-devel,
Alex Deucher, Christian König, Pan
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@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for nightly.conf: drop amd branches from drm-tip
2021-05-19 8:49 ` Jani Nikula
(?)
(?)
@ 2021-05-19 11:01 ` Patchwork
-1 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2021-05-19 11:01 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: nightly.conf: drop amd branches from drm-tip
URL : https://patchwork.freedesktop.org/series/90317/
State : failure
== Summary ==
Applying: nightly.conf: drop amd branches from drm-tip
Using index info to reconstruct a base tree...
A nightly.conf
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): nightly.conf deleted in HEAD and modified in nightly.conf: drop amd branches from drm-tip. Version nightly.conf: drop amd branches from drm-tip of nightly.conf left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 nightly.conf: drop amd branches from drm-tip
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
2021-05-19 8:49 ` Jani Nikula
@ 2021-05-19 13:28 ` Deucher, Alexander
-1 siblings, 0 replies; 11+ messages in thread
From: Deucher, Alexander @ 2021-05-19 13:28 UTC (permalink / raw)
To: Jani Nikula, dim-tools@lists.freedesktop.org
Cc: Daniel Vetter, intel-gfx@lists.freedesktop.org, Pan, Xinhui,
Koenig, Christian, dri-devel@lists.freedesktop.org
[AMD Public Use]
> -----Original Message-----
> From: Jani Nikula <jani.nikula@intel.com>
> Sent: Wednesday, May 19, 2021 4:50 AM
> To: dim-tools@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org; intel-gfx@lists.freedesktop.org;
> jani.nikula@intel.com; Deucher, Alexander
> <Alexander.Deucher@amd.com>; Koenig, Christian
> <Christian.Koenig@amd.com>; Pan; Pan, Xinhui <Xinhui.Pan@amd.com>;
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Subject: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
>
> 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@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> 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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
> misc&data=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf
> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> p;sdata=espN%2BoIX9SjLh2Py%2FkqlVsi0p9Ru%2Fet2M11XWqJ5eUQ%3D&a
> mp;reserved=0
>
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
> misc.git&data=04%7C01%7Calexander.deucher%40amd.com%7C590389
> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0
> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&
> amp;sdata=E5cwRH0Pr9JkIfIMNkNzjlLn5hN6k0inxBkk%2Bwhd1lk%3D&r
> eserved=0
> "
> -drm_tip_repos[drm-amd]="
> -ssh://git.freedesktop.org/git/drm/drm-amd
> -git://anongit.freedesktop.org/drm/drm-amd
> -
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
> amd&data=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf
> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> p;sdata=1kQe4t89CyANqRhNUpQ2RP3Ndz7A3sdd%2FiWZ7FmKHM4%3D&a
> mp;reserved=0
> -
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
> amd.git&data=04%7C01%7Calexander.deucher%40amd.com%7C590389
> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0
> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&
> amp;sdata=vVqMWMbdJFHJW8j09tn1m7ItGSL0RmfeDbJZFWoYBf4%3D&am
> p;reserved=0
> -"
> 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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
@ 2021-05-19 13:28 ` Deucher, Alexander
0 siblings, 0 replies; 11+ messages in thread
From: Deucher, Alexander @ 2021-05-19 13:28 UTC (permalink / raw)
To: Jani Nikula, dim-tools@lists.freedesktop.org
Cc: Daniel Vetter, intel-gfx@lists.freedesktop.org, Pan, Xinhui,
Koenig, Christian, dri-devel@lists.freedesktop.org
[AMD Public Use]
> -----Original Message-----
> From: Jani Nikula <jani.nikula@intel.com>
> Sent: Wednesday, May 19, 2021 4:50 AM
> To: dim-tools@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org; intel-gfx@lists.freedesktop.org;
> jani.nikula@intel.com; Deucher, Alexander
> <Alexander.Deucher@amd.com>; Koenig, Christian
> <Christian.Koenig@amd.com>; Pan; Pan, Xinhui <Xinhui.Pan@amd.com>;
> Daniel Vetter <daniel.vetter@ffwll.ch>
> Subject: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
>
> 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@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> 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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
> misc&data=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf
> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> p;sdata=espN%2BoIX9SjLh2Py%2FkqlVsi0p9Ru%2Fet2M11XWqJ5eUQ%3D&a
> mp;reserved=0
>
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
> misc.git&data=04%7C01%7Calexander.deucher%40amd.com%7C590389
> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0
> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&
> amp;sdata=E5cwRH0Pr9JkIfIMNkNzjlLn5hN6k0inxBkk%2Bwhd1lk%3D&r
> eserved=0
> "
> -drm_tip_repos[drm-amd]="
> -ssh://git.freedesktop.org/git/drm/drm-amd
> -git://anongit.freedesktop.org/drm/drm-amd
> -
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
> amd&data=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf
> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> p;sdata=1kQe4t89CyANqRhNUpQ2RP3Ndz7A3sdd%2FiWZ7FmKHM4%3D&a
> mp;reserved=0
> -
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
> amd.git&data=04%7C01%7Calexander.deucher%40amd.com%7C590389
> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0
> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&
> amp;sdata=vVqMWMbdJFHJW8j09tn1m7ItGSL0RmfeDbJZFWoYBf4%3D&am
> p;reserved=0
> -"
> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
2021-05-19 13:28 ` Deucher, Alexander
@ 2021-05-24 12:00 ` Jani Nikula
-1 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2021-05-24 12:00 UTC (permalink / raw)
To: Deucher, Alexander, dim-tools@lists.freedesktop.org
Cc: Daniel Vetter, intel-gfx@lists.freedesktop.org, Pan, Xinhui,
Koenig, Christian, dri-devel@lists.freedesktop.org
On Wed, 19 May 2021, "Deucher, Alexander" <Alexander.Deucher@amd.com> wrote:
> [AMD Public Use]
>
>> -----Original Message-----
>> From: Jani Nikula <jani.nikula@intel.com>
>> Sent: Wednesday, May 19, 2021 4:50 AM
>> To: dim-tools@lists.freedesktop.org
>> Cc: dri-devel@lists.freedesktop.org; intel-gfx@lists.freedesktop.org;
>> jani.nikula@intel.com; Deucher, Alexander
>> <Alexander.Deucher@amd.com>; Koenig, Christian
>> <Christian.Koenig@amd.com>; Pan; Pan, Xinhui <Xinhui.Pan@amd.com>;
>> Daniel Vetter <daniel.vetter@ffwll.ch>
>> Subject: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
>>
>> 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@amd.com>
>> Cc: Christian König <christian.koenig@amd.com>
>> Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Thanks, pushed out and rebuilt drm-tip.
BR,
Jani.
>
>> ---
>> 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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
>> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
>> misc&data=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf
>> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
>> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
>> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
>> p;sdata=espN%2BoIX9SjLh2Py%2FkqlVsi0p9Ru%2Fet2M11XWqJ5eUQ%3D&a
>> mp;reserved=0
>>
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
>> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
>> misc.git&data=04%7C01%7Calexander.deucher%40amd.com%7C590389
>> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0
>> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
>> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&
>> amp;sdata=E5cwRH0Pr9JkIfIMNkNzjlLn5hN6k0inxBkk%2Bwhd1lk%3D&r
>> eserved=0
>> "
>> -drm_tip_repos[drm-amd]="
>> -ssh://git.freedesktop.org/git/drm/drm-amd
>> -git://anongit.freedesktop.org/drm/drm-amd
>> -
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
>> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
>> amd&data=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf
>> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
>> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
>> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
>> p;sdata=1kQe4t89CyANqRhNUpQ2RP3Ndz7A3sdd%2FiWZ7FmKHM4%3D&a
>> mp;reserved=0
>> -
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
>> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
>> amd.git&data=04%7C01%7Calexander.deucher%40amd.com%7C590389
>> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0
>> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
>> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&
>> amp;sdata=vVqMWMbdJFHJW8j09tn1m7ItGSL0RmfeDbJZFWoYBf4%3D&am
>> p;reserved=0
>> -"
>> 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
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
@ 2021-05-24 12:00 ` Jani Nikula
0 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2021-05-24 12:00 UTC (permalink / raw)
To: Deucher, Alexander, dim-tools@lists.freedesktop.org
Cc: Daniel Vetter, intel-gfx@lists.freedesktop.org, Pan, Xinhui,
Koenig, Christian, dri-devel@lists.freedesktop.org
On Wed, 19 May 2021, "Deucher, Alexander" <Alexander.Deucher@amd.com> wrote:
> [AMD Public Use]
>
>> -----Original Message-----
>> From: Jani Nikula <jani.nikula@intel.com>
>> Sent: Wednesday, May 19, 2021 4:50 AM
>> To: dim-tools@lists.freedesktop.org
>> Cc: dri-devel@lists.freedesktop.org; intel-gfx@lists.freedesktop.org;
>> jani.nikula@intel.com; Deucher, Alexander
>> <Alexander.Deucher@amd.com>; Koenig, Christian
>> <Christian.Koenig@amd.com>; Pan; Pan, Xinhui <Xinhui.Pan@amd.com>;
>> Daniel Vetter <daniel.vetter@ffwll.ch>
>> Subject: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
>>
>> 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@amd.com>
>> Cc: Christian König <christian.koenig@amd.com>
>> Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Thanks, pushed out and rebuilt drm-tip.
BR,
Jani.
>
>> ---
>> 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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
>> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
>> misc&data=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf
>> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
>> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
>> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
>> p;sdata=espN%2BoIX9SjLh2Py%2FkqlVsi0p9Ru%2Fet2M11XWqJ5eUQ%3D&a
>> mp;reserved=0
>>
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
>> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
>> misc.git&data=04%7C01%7Calexander.deucher%40amd.com%7C590389
>> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0
>> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
>> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&
>> amp;sdata=E5cwRH0Pr9JkIfIMNkNzjlLn5hN6k0inxBkk%2Bwhd1lk%3D&r
>> eserved=0
>> "
>> -drm_tip_repos[drm-amd]="
>> -ssh://git.freedesktop.org/git/drm/drm-amd
>> -git://anongit.freedesktop.org/drm/drm-amd
>> -
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
>> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
>> amd&data=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf
>> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
>> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
>> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
>> p;sdata=1kQe4t89CyANqRhNUpQ2RP3Ndz7A3sdd%2FiWZ7FmKHM4%3D&a
>> mp;reserved=0
>> -
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano
>> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm-
>> amd.git&data=04%7C01%7Calexander.deucher%40amd.com%7C590389
>> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0
>> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
>> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&
>> amp;sdata=vVqMWMbdJFHJW8j09tn1m7ItGSL0RmfeDbJZFWoYBf4%3D&am
>> p;reserved=0
>> -"
>> 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
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
2021-05-24 12:00 ` Jani Nikula
@ 2021-05-24 12:05 ` Jani Nikula
-1 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2021-05-24 12:05 UTC (permalink / raw)
To: Deucher, Alexander, dim-tools@lists.freedesktop.org
Cc: Daniel Vetter, intel-gfx@lists.freedesktop.org, Pan, Xinhui,
Koenig, Christian, dri-devel@lists.freedesktop.org
On Mon, 24 May 2021, Jani Nikula <jani.nikula@intel.com> wrote:
> On Wed, 19 May 2021, "Deucher, Alexander" <Alexander.Deucher@amd.com> wrote:
>> [AMD Public Use]
>>
>>> -----Original Message-----
>>> From: Jani Nikula <jani.nikula@intel.com>
>>> Sent: Wednesday, May 19, 2021 4:50 AM
>>> To: dim-tools@lists.freedesktop.org
>>> Cc: dri-devel@lists.freedesktop.org; intel-gfx@lists.freedesktop.org;
>>> jani.nikula@intel.com; Deucher, Alexander
>>> <Alexander.Deucher@amd.com>; Koenig, Christian
>>> <Christian.Koenig@amd.com>; Pan; Pan, Xinhui <Xinhui.Pan@amd.com>;
>>> Daniel Vetter <daniel.vetter@ffwll.ch>
>>> Subject: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
>>>
>>> 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@amd.com>
>>> Cc: Christian König <christian.koenig@amd.com>
>>> Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
>>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>
>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
> Thanks, pushed out and rebuilt drm-tip.
Note that drm-tip is unchanged after this, apart from the
integration-manifest.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
@ 2021-05-24 12:05 ` Jani Nikula
0 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2021-05-24 12:05 UTC (permalink / raw)
To: Deucher, Alexander, dim-tools@lists.freedesktop.org
Cc: Daniel Vetter, intel-gfx@lists.freedesktop.org, Pan, Xinhui,
Koenig, Christian, dri-devel@lists.freedesktop.org
On Mon, 24 May 2021, Jani Nikula <jani.nikula@intel.com> wrote:
> On Wed, 19 May 2021, "Deucher, Alexander" <Alexander.Deucher@amd.com> wrote:
>> [AMD Public Use]
>>
>>> -----Original Message-----
>>> From: Jani Nikula <jani.nikula@intel.com>
>>> Sent: Wednesday, May 19, 2021 4:50 AM
>>> To: dim-tools@lists.freedesktop.org
>>> Cc: dri-devel@lists.freedesktop.org; intel-gfx@lists.freedesktop.org;
>>> jani.nikula@intel.com; Deucher, Alexander
>>> <Alexander.Deucher@amd.com>; Koenig, Christian
>>> <Christian.Koenig@amd.com>; Pan; Pan, Xinhui <Xinhui.Pan@amd.com>;
>>> Daniel Vetter <daniel.vetter@ffwll.ch>
>>> Subject: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
>>>
>>> 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@amd.com>
>>> Cc: Christian König <christian.koenig@amd.com>
>>> Cc: Pan, Xinhui <Xinhui.Pan@amd.com>
>>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>
>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
> Thanks, pushed out and rebuilt drm-tip.
Note that drm-tip is unchanged after this, apart from the
integration-manifest.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 11+ messages in thread