RE: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
On Mon, 24 May 2021, Jani Nikula wrote: > On Wed, 19 May 2021, "Deucher, Alexander" wrote: >> [AMD Public Use] >> >>> -Original Message- >>> From: Jani Nikula >>> Sent: Wednesday, May 19, 2021 4:50 AM >>> To: dim-to...@lists.freedesktop.org >>> Cc: dri-devel@lists.freedesktop.org; intel-...@lists.freedesktop.org; >>> jani.nik...@intel.com; Deucher, Alexander >>> ; Koenig, Christian >>> ; Pan; Pan, Xinhui ; >>> Daniel Vetter >>> 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 >>> Cc: Christian König >>> Cc: Pan, Xinhui >>> Cc: Daniel Vetter >>> Signed-off-by: Jani Nikula >> >> Reviewed-by: Alex Deucher > > 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
RE: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
On Wed, 19 May 2021, "Deucher, Alexander" wrote: > [AMD Public Use] > >> -Original Message- >> From: Jani Nikula >> Sent: Wednesday, May 19, 2021 4:50 AM >> To: dim-to...@lists.freedesktop.org >> Cc: dri-devel@lists.freedesktop.org; intel-...@lists.freedesktop.org; >> jani.nik...@intel.com; Deucher, Alexander >> ; Koenig, Christian >> ; Pan; Pan, Xinhui ; >> Daniel Vetter >> 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 >> Cc: Christian König >> Cc: Pan, Xinhui >> Cc: Daniel Vetter >> Signed-off-by: Jani Nikula > > Reviewed-by: Alex Deucher 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- >> miscdata=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf >> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7 >> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w >> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000 >> p;sdata=espN%2BoIX9SjLh2Py%2FkqlVsi0p9Ru%2Fet2M11XWqJ5eUQ%3D >> mp;reserved=0 >> >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano >> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm- >> misc.gitdata=04%7C01%7Calexander.deucher%40amd.com%7C590389 >> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0 >> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC >> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000& >> amp;sdata=E5cwRH0Pr9JkIfIMNkNzjlLn5hN6k0inxBkk%2Bwhd1lk%3Dr >> 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- >> amddata=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf >> 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7 >> C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w >> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000 >> p;sdata=1kQe4t89CyANqRhNUpQ2RP3Ndz7A3sdd%2FiWZ7FmKHM4%3D >> mp;reserved=0 >> - >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano >> ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm- >> amd.gitdata=04%7C01%7Calexander.deucher%40amd.com%7C590389 >> 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0 >> %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC >> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000& >> amp;sdata=vVqMWMbdJFHJW8j09tn1m7ItGSL0RmfeDbJZFWoYBf4%3D >> 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=( >> "drmdrm-fixes" >> "drm-misc drm-misc-fixes" >> "drm-intel drm-intel-fixes" >> -"drm-amddrm-amd-fixes" >> >> "drmdrm-next" >> "drm-misc drm-misc-next-fixes" >> "drm-intel drm-intel-next-fixes" >> -"drm-amddrm-amd-next-fixes" >> >> "drm-misc drm-misc-next" >> "drm-intel drm-intel-next" >> "drm-intel drm-intel-gt-next" >> -"drm-amddrm-amd-next" >> >> "sound-upstream for-linus" >> "sound-upstream for-next" >> -- >> 2.20.1 -- Jani Nikula, Intel Open Source Graphics Center
RE: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
[AMD Public Use] > -Original Message- > From: Jani Nikula > Sent: Wednesday, May 19, 2021 4:50 AM > To: dim-to...@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org; intel-...@lists.freedesktop.org; > jani.nik...@intel.com; Deucher, Alexander > ; Koenig, Christian > ; Pan; Pan, Xinhui ; > Daniel Vetter > 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 > Cc: Christian König > Cc: Pan, Xinhui > Cc: Daniel Vetter > Signed-off-by: Jani Nikula Reviewed-by: Alex Deucher > --- > 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- > miscdata=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf > 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7 > C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w > LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000 > p;sdata=espN%2BoIX9SjLh2Py%2FkqlVsi0p9Ru%2Fet2M11XWqJ5eUQ%3D > mp;reserved=0 > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano > ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm- > misc.gitdata=04%7C01%7Calexander.deucher%40amd.com%7C590389 > 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0 > %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC > 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000& > amp;sdata=E5cwRH0Pr9JkIfIMNkNzjlLn5hN6k0inxBkk%2Bwhd1lk%3Dr > 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- > amddata=04%7C01%7Calexander.deucher%40amd.com%7C5903896cf > 2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7 > C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w > LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000 > p;sdata=1kQe4t89CyANqRhNUpQ2RP3Ndz7A3sdd%2FiWZ7FmKHM4%3D > mp;reserved=0 > - > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fano > ngit.freedesktop.org%2Fgit%2Fdrm%2Fdrm- > amd.gitdata=04%7C01%7Calexander.deucher%40amd.com%7C590389 > 6cf2e642afb05408d91aa30f6d%7C3dd8961fe4884e608e11a82d994e183d%7C0 > %7C0%7C637570109906926805%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC > 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000& > amp;sdata=vVqMWMbdJFHJW8j09tn1m7ItGSL0RmfeDbJZFWoYBf4%3D > 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=( > "drmdrm-fixes" > "drm-misc drm-misc-fixes" > "drm-intel drm-intel-fixes" > - "drm-amddrm-amd-fixes" > > "drmdrm-next" > "drm-misc drm-misc-next-fixes" > "drm-intel drm-intel-next-fixes" > - "drm-amddrm-amd-next-fixes" > > "drm-misc drm-misc-next" > "drm-intel drm-intel-next" > "drm-intel drm-intel-gt-next" > - "drm-amddrm-amd-next" > > "sound-upstream for-linus" > "sound-upstream for-next" > -- > 2.20.1
Re: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
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 > Cc: Christian König > Cc: Pan, Xinhui > Cc: Daniel Vetter > Signed-off-by: Jani Nikula Acked-by: Daniel Vetter > --- > 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=( > "drmdrm-fixes" > "drm-misc drm-misc-fixes" > "drm-intel drm-intel-fixes" > - "drm-amddrm-amd-fixes" > > "drmdrm-next" > "drm-misc drm-misc-next-fixes" > "drm-intel drm-intel-next-fixes" > - "drm-amddrm-amd-next-fixes" > > "drm-misc drm-misc-next" > "drm-intel drm-intel-next" > "drm-intel drm-intel-gt-next" > - "drm-amddrm-amd-next" > > "sound-upstream for-linus" > "sound-upstream for-next" > -- > 2.20.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
