On Thu, Jul 6, 2023 at 5:29 AM Jani Nikula <jani.nikula@xxxxxxxxx> wrote: > > We used to have the sound branches be part of drm-tip to help > development of DP and HDMI audio. However, we always used to run into > problems with the sound branches merging Linus' master at non-tagged > random commits, wreaking havoc especially during the merge windows. We > only ever want to have tagged stuff merged back from Linus' tree to > drm-tip. > > We introduced a mechanism in dim to hold back branches at certain > commits, just to hold back sound branches when problems arise. We moved > it along, but in the end nobody has updated this in literally years, and > sound branches have been held back at v5.13. > > The merge window is currently open, and AFAICT the sound/for-linus > branch again contains commits from the merge window. > > Let's just forget about the sound tree, as nobody has really missed it > since v5.13, and focus on the drm branches. > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > nightly.conf | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/nightly.conf b/nightly.conf > index 73aec820e98f..c1e22800e276 100644 > --- a/nightly.conf > +++ b/nightly.conf > @@ -46,11 +46,6 @@ git://anongit.freedesktop.org/drm/drm > https://anongit.freedesktop.org/git/drm/drm > https://anongit.freedesktop.org/git/drm/drm.git > " > -drm_tip_repos[sound-upstream]=" > -git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git > -https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git > -https://kernel.googlesource.com/pub/scm/linux/kernel/git/tiwai/sound.git > -" > drm_tip_repos[linux-upstream]=" > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > @@ -79,8 +74,6 @@ drm_tip_config=( > "drm-intel drm-intel-next" > "drm-intel drm-intel-gt-next" > > - "sound-upstream for-linus v5.13" > - "sound-upstream for-next v5.13" > "drm-intel topic/core-for-CI" > "drm-misc topic/i915-ttm" > "drm topic/nouveau-misc" > -- > 2.39.2 >
