linux-kernel - Re: linux-next: build warning after merge of the drm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <163533676481.68716.4009950051571709814@jlahtine-mobl.ger.corp.intel.com>
Date:   Wed, 27 Oct 2021 15:12:44 +0300
From:   Joonas Lahtinen <joonas.lahtinen@...ux.intel.com>
To:     "Nikula, Jani" <jani.nikula@...ux.intel.com>,
        Daniel Vetter <daniel@...ll.ch>,
        Rodrigo Vivi <rodrigo.vivi@...el.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Tvrtko Ursulin <tvrtko.ursulin@...ux.intel.com>
Cc:     Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Chris Wilson <chris@...is-wilson.co.uk>
Subject: Re: linux-next: build warning after merge of the drm tree

(+ Tvrtko who was recently added as a drm/i915 co-maintainer)

Quoting Daniel Vetter (2021-01-22 10:40:48)
> On Fri, Jan 22, 2021 at 8:29 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Hi Daniel,
> >
> > On Fri, 22 Jan 2021 08:17:58 +0100 Daniel Vetter <daniel@...ll.ch> wrote:
> > >
> > > Hm that has been in drm-intel-gt-next for a few days, is that tree not
> > > in linux-next?
> >
> > It is not.

Hi Stephen,

We should be now good to go and add drm-intel-gt-next to linux-next.

The branch would be as follows:

drm-intel-gt-next	git://anongit.freedesktop.org/drm-intel	for-linux-next-gt

Notice the "-gt" and the end of the for-linux-next branch name. This should eliminate
the gap we have been having. The change to add it to the DIM tool is here:

https://gitlab.freedesktop.org/drm/maintainer-tools/-/commit/7b5c2c29cdbc054e8c8fce38f095c56290fc4833

So once all developers have updated their tooling (for which they will
get an automatic nag message) we should be all up-to-date for future
merge windows.

Regards, Joonas

> Adding -intel maintainers to get that sorted.
> -Daniel
> 
> > These are the drm branches currently in linux-next:
> 
> Oh for ordering maybe put drm-misc ahead of the other subtrees, -misc
> is where nowadays a lot of refactorings and core changes land.
> Probably doesn't matter in practice.
> -Daniel
> 
> > drm-fixes       git://git.freedesktop.org/git/drm/drm.git       drm-fixes
> > amdgpu-fixes    git://people.freedesktop.org/~agd5f/linux       drm-fixes
> > drm-intel-fixes git://anongit.freedesktop.org/drm-intel         for-linux-next-fixes
> > drm-misc-fixes  git://anongit.freedesktop.org/drm/drm-misc      for-linux-next-fixes
> > drm             git://git.freedesktop.org/git/drm/drm.git       drm-next
> > amdgpu          https://gitlab.freedesktop.org/agd5f/linux      drm-next
> > drm-intel       git://anongit.freedesktop.org/drm-intel         for-linux-next
> > drm-tegra       git://anongit.freedesktop.org/tegra/linux.git   drm/tegra/for-next
> > drm-misc        git://anongit.freedesktop.org/drm/drm-misc      for-linux-next
> > drm-msm         https://gitlab.freedesktop.org/drm/msm.git      msm-next
> > imx-drm         https://git.pengutronix.de/git/pza/linux        imx-drm/next
> > etnaviv         https://git.pengutronix.de/git/lst/linux        etnaviv/next
> >
> > --
> > Cheers,
> > Stephen Rothwell
> 
> 
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch