[PATCH 3/8] docs: update drm-intel repository info

[Jani Nikula]

On Tue, 25 Oct 2022, Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com> wrote:
> On 25/10/2022 11:19, Jani Nikula wrote:
>> Primarily fix the glaring omission of drm-intel-gt-next from the
>> documentation, but also clarify and clean up other details.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> ---
>>   repositories.rst | 38 +++++++++++++++++++++++---------------
>>   1 file changed, 23 insertions(+), 15 deletions(-)
>> 
>> diff --git a/repositories.rst b/repositories.rst
>> index 3cb71fcaf079..e6be9a9d7f8d 100644
>> --- a/repositories.rst
>> +++ b/repositories.rst
>> @@ -102,43 +102,51 @@ The Upstream i915 Driver Repository
>>   
>>   See :ref:`drm-intel` and `the drm-intel repository`_ for repository
>>   details. Maintained by Jani Nikula, Joonas Lahtinen and Rodrigo Vivi, with a
>> -large pool of committers. Consists mostly of ``drivers/gpu/drm/i915``.
>> +large pool of committers. Consists mostly of ``drivers/gpu/drm/i915`` and
>> +``include/drm/i915_*.h``.
>
> "Or check MAINTAINERS in the kernel tree for most up to date.." people 
> and dirs ?

The file begins with:

	All the relevant repositories and branches are described below. For the current
	list of maintainers, mailing lists, etc. please refer to MAINTAINERS_.

	.. _MAINTAINERS: https://cgit.freedesktop.org/drm/drm-tip/plain/MAINTAINERS

>
>>   .. _the drm-intel repository: https://cgit.freedesktop.org/drm/drm-intel
>>   
>> -drm-intel-next (aka "din")
>> -~~~~~~~~~~~~~~~~~~~~~~~~~~
>> +drm-intel-next (aka "din") and drm-intel-gt-next (aka "dign")
>> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>   
>> -This is the branch where all new features, as well as any non-trivial or
>> -controversial fixes, are applied.
>> +These are the branches where all drm/i915 patches, both new features and fixes,
>> +are applied.
>>   
>> -This branch "hides" the merge window from the drm/i915 developers; patches are
>> -applied here regardless of the development phase of Linus' upstream kernel.
>> +drm-intel-gt-next is for gem/gt code, and drm-intel-next is for everything else,
>
> Drm-intel-gt-next since it is start of sentence. I'd capitalize GEM and 
> GT as well but it could a personal preference.

I could capitalize GEM/GT in there, but I generally prefer not
capitalizing case sensitive names even at the start of a sentence.

>
>> +including i915 driver core and display.
>>   
>> -(This branch is effectively the same as drm-intel-next-queued, or "dinq", used
>> -to be.)
>> +These branches "hide" the merge window from the drm/i915 developers; patches are
>> +applied here regardless of the development phase of Linus' upstream kernel. Pull
>> +requests to drm-next are sent as needed between -rc1 of the current kernel and
>> +the drm feature deadline (-rc5/-rc6 of the current kernel).
>> +
>> +Note that drm-intel-next may be cross-merged directly to drm-intel-gt-next, but
>> +not vice versa. Syncing drm-intel-gt-next changes back to drm-intel-next must
>> +happen via a pull request to drm-next and a backmerge to drm-intel-next.
>>   
>>   drm-intel-next-fixes (aka "dinf")
>>   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>   
>>   This branch contains drm/i915 specific fixes to drm-next after the drm/i915
>>   features have been merged there. Fixes are first applied to drm-intel-next, and
>> -cherry-picked to drm-intel-next-fixes.
>> +cherry-picked to drm-intel-next-fixes by maintainers. Valid from drm feature
>> +deadline (-rc5/-rc6 of the current kernel) to -rc1 of the next kernel.
>>   
>> -Pull requests to Dave are sent as needed, with no particular schedule.
>> +Pull requests to drm-next are sent as needed, with no particular schedule.
>>   
>>   drm-intel-fixes (aka "-fixes")
>>   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>   
>>   This branch contains fixes to Linus' tree after drm-next has been merged during
>>   the merge window. Fixes are first applied to drm-intel-next, and cherry-picked
>> -to drm-intel-fixes. The fixes are then merged through drm-fixes.  Valid
>> -from -rc1 to the kernel release.
>> +to drm-intel-fixes by maintainers. The fixes are then merged through drm-fixes.
>> +Valid from -rc1 to the kernel release.
>>   
>>   Usually Linus releases each -rc on a Sunday, and drm-intel-fixes gets rebased on
>>   that the following Monday. Usually this is a fast-forward. The pull request to
>> -Dave for new fixes is typically sent on the following Thursday. This is repeated
>> -until final release of the kernel.
>> +drm-fixes for new fixes is typically sent on the following Thursday. This is
>> +repeated until final release of the kernel.
>>   
>>   This is the fastest path to getting fixes to Linus' tree. It is generally for
>>   the regressions, cc:stable, black screens, GPU hangs only, and should pretty
>
> LGTM.
>
> Acked-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Thanks.

>
> Regards,
>
> Tvrtko

-- 
Jani Nikula, Intel Open Source Graphics Center