[PATCH 1/3] drm: Document maintainer duties

[PATCH 1/3] drm: Document maintainer duties

[Daniel Vetter]

I wanted to get Sean Paul to run the drm-misc show for a bit, for
training reasons and to increase the bus factor. And then realized
there's no docs about what maintainers are doing.

Fix that.

v2: Add backmerges and taking the blame.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drm-misc.rst | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/drm-misc.rst b/drm-misc.rst
index 139d45e92edf..b6d01f2c7c2b 100644
--- a/drm-misc.rst
+++ b/drm-misc.rst
@@ -142,6 +142,42 @@ Slightly different rules apply:
   more involved rework in follow-up work. This way lengthy review cycles get
   avoided, which are a drag for both reviewer and author.
 
+Maintainer's Duties
+===================
+
+Maintainers mostly provide services to keep drm-misc running smoothly:
+
+* Coordinate cross-subsystem depencies and handle topic branches, sending out
+  pull request and merging topic pull requests from other subsystems.
+
+* At least once per week check for pending bugfixes (using ``dim status``) and
+  if there are any (either in `-fixes` or `-next-fixes`), send out the pull
+  request.
+
+* Fast-forward (when possible) `-fixes` to each released -rc kernel tag, to
+  keep it current. We try to avoid backmerges for bugfix branches, and rebasing
+  isn't an option with multiple committers.
+
+* During the merge-windo blackout, i.e. from -rc6 on until the merge window
+  closes with the release of -rc1, try to track `drm-next` with the
+  `-next-fixes` branch. Do not advance past -rc1, otherwise the automagic in
+  the scripts will push the wrong patches to the linux-next tree.
+
+* Between -rc1 and -rc6 send pull requests for the `-next` branch every 1-2
+  weeks, depending upon how much is queued up.
+
+* Backmerge `drm-next` into the `-next` branch when needed, properly recording
+  that reason in the merge commit message. Do a backmerge at least once per
+  month to avoid conflict chaos, and specifically merge in the main drm feature
+  pull request, to resync with all the late driver submissions during the merge
+  window.
+
+* Last resort fallback for applying patches, in case all area expert committers
+  are somehow unavailable.
+
+* Take the blame when something goes wrong. Maintainers interface and represent
+  the entire group of committers to the wider kernel community.
+
 Tooling
 =======
 
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 2/3] dim: Review subcommand docs

[Daniel Vetter]

Inspired by Jani's efforts to clean this up and structure it better.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim.rst | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/dim.rst b/dim.rst
index 2f8fda8c42a7..be541d80ec7e 100644
--- a/dim.rst
+++ b/dim.rst
@@ -283,7 +283,9 @@ any changes with git add -u and continues the rebase.
 apply-resolved
 --------------
 Compile-test the current tree and if successfully resolve a
-confilicted git am. Also runs the patch checker afterwards.
+conflicted git am. Also runs the patch checker afterwards.
+
+FIXME: Forgets to add the Link: tag.
 
 create-branch *branch* [*commit-ish*]
 -------------------------------------
@@ -299,9 +301,8 @@ Remove the given topic branch.
 
 create-workdir (*branch* | all)
 -------------------------------
-Create a separate workdir for the branch with the given name (requires that
-git-new-workdir from git-core contrib is installed), or for all branches if
-"all" is given.
+Create a separate workdir for the branch with the given name, or for all
+branches if "all" is given.
 
 for-each-workdir|fw *command*
 -----------------------------
@@ -313,8 +314,8 @@ COMMANDS FOR MAINTAINERS
 
 cherry-pick *commit-ish* [*git cherry-pick arguments*]
 ------------------------------------------------------
-Improved git cherry-pick version which also scans drm-tip picked, too. In
-dry-run mode/-d only the patch list is generated.
+Improved git cherry-pick version which also scans drm-tip for additional
+cherry-pick candidates. In dry-run mode/-d only the patch list is generated.
 
 cherry-pick-fixes
 -----------------
@@ -366,6 +367,13 @@ opened.
 Also checks that the drm-intel-fixes|-next-queued are fully
 merged into drm-tip to avoid operator error.
 
+update-next-continue
+--------------------
+
+When **update-next** fails to push the special release commit (because it raced with
+another committer) rebase and push manually, and then continue using this
+command.
+
 tag-next
 --------
 Pushes a new tag for the current drm-intel-next state after checking that the
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 3/3] dim: Backronym

[Daniel Vetter]

It's kinda beyond just drm-intel nowadays ...

Idea from Jani on irc.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dim.rst b/dim.rst
index be541d80ec7e..87a8906aad8d 100644
--- a/dim.rst
+++ b/dim.rst
@@ -2,9 +2,9 @@
  dim
 =====
 
----------------------------
-drm-intel maintainer script
----------------------------
+--------------------------------
+drm inglorious maintainer script
+--------------------------------
 
 :Author: Daniel Vetter <daniel.vetter@ffwll.ch>
 :Author: Jani Nikula <jani.nikula@intel.com>
-- 
2.11.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/3] dim: Review subcommand docs

[Daniel Vetter]

On Mon, Mar 27, 2017 at 10:45:45AM +0200, Daniel Vetter wrote:
> Inspired by Jani's efforts to clean this up and structure it better.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Forgot to add in the commit message: This adds the doc for
update-next-continue.
-Daniel

> ---
>  dim.rst | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/dim.rst b/dim.rst
> index 2f8fda8c42a7..be541d80ec7e 100644
> --- a/dim.rst
> +++ b/dim.rst
> @@ -283,7 +283,9 @@ any changes with git add -u and continues the rebase.
>  apply-resolved
>  --------------
>  Compile-test the current tree and if successfully resolve a
> -confilicted git am. Also runs the patch checker afterwards.
> +conflicted git am. Also runs the patch checker afterwards.
> +
> +FIXME: Forgets to add the Link: tag.
>  
>  create-branch *branch* [*commit-ish*]
>  -------------------------------------
> @@ -299,9 +301,8 @@ Remove the given topic branch.
>  
>  create-workdir (*branch* | all)
>  -------------------------------
> -Create a separate workdir for the branch with the given name (requires that
> -git-new-workdir from git-core contrib is installed), or for all branches if
> -"all" is given.
> +Create a separate workdir for the branch with the given name, or for all
> +branches if "all" is given.
>  
>  for-each-workdir|fw *command*
>  -----------------------------
> @@ -313,8 +314,8 @@ COMMANDS FOR MAINTAINERS
>  
>  cherry-pick *commit-ish* [*git cherry-pick arguments*]
>  ------------------------------------------------------
> -Improved git cherry-pick version which also scans drm-tip picked, too. In
> -dry-run mode/-d only the patch list is generated.
> +Improved git cherry-pick version which also scans drm-tip for additional
> +cherry-pick candidates. In dry-run mode/-d only the patch list is generated.
>  
>  cherry-pick-fixes
>  -----------------
> @@ -366,6 +367,13 @@ opened.
>  Also checks that the drm-intel-fixes|-next-queued are fully
>  merged into drm-tip to avoid operator error.
>  
> +update-next-continue
> +--------------------
> +
> +When **update-next** fails to push the special release commit (because it raced with
> +another committer) rebase and push manually, and then continue using this
> +command.
> +
>  tag-next
>  --------
>  Pushes a new tag for the current drm-intel-next state after checking that the
> -- 
> 2.11.0
> 

-- 
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

Re: [PATCH 2/3] dim: Review subcommand docs

[Jani Nikula]

On Mon, 27 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Inspired by Jani's efforts to clean this up and structure it better.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  dim.rst | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/dim.rst b/dim.rst
> index 2f8fda8c42a7..be541d80ec7e 100644
> --- a/dim.rst
> +++ b/dim.rst
> @@ -283,7 +283,9 @@ any changes with git add -u and continues the rebase.
>  apply-resolved
>  --------------
>  Compile-test the current tree and if successfully resolve a
> -confilicted git am. Also runs the patch checker afterwards.
> +conflicted git am. Also runs the patch checker afterwards.
> +
> +FIXME: Forgets to add the Link: tag.

Please either change this to "This fails to add the Link: tag, so you'll
need to add it manually or use the **add-link** subcommand." or similar,
or add the FIXME comment in dim source, or both. I don't much like FIXME
comments in documentation.

Otherwise lgtm.

BR,
Jani.

>  
>  create-branch *branch* [*commit-ish*]
>  -------------------------------------
> @@ -299,9 +301,8 @@ Remove the given topic branch.
>  
>  create-workdir (*branch* | all)
>  -------------------------------
> -Create a separate workdir for the branch with the given name (requires that
> -git-new-workdir from git-core contrib is installed), or for all branches if
> -"all" is given.
> +Create a separate workdir for the branch with the given name, or for all
> +branches if "all" is given.
>  
>  for-each-workdir|fw *command*
>  -----------------------------
> @@ -313,8 +314,8 @@ COMMANDS FOR MAINTAINERS
>  
>  cherry-pick *commit-ish* [*git cherry-pick arguments*]
>  ------------------------------------------------------
> -Improved git cherry-pick version which also scans drm-tip picked, too. In
> -dry-run mode/-d only the patch list is generated.
> +Improved git cherry-pick version which also scans drm-tip for additional
> +cherry-pick candidates. In dry-run mode/-d only the patch list is generated.
>  
>  cherry-pick-fixes
>  -----------------
> @@ -366,6 +367,13 @@ opened.
>  Also checks that the drm-intel-fixes|-next-queued are fully
>  merged into drm-tip to avoid operator error.
>  
> +update-next-continue
> +--------------------
> +
> +When **update-next** fails to push the special release commit (because it raced with
> +another committer) rebase and push manually, and then continue using this
> +command.
> +
>  tag-next
>  --------
>  Pushes a new tag for the current drm-intel-next state after checking that the

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 3/3] dim: Backronym

[Jani Nikula]

On Mon, 27 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> It's kinda beyond just drm-intel nowadays ...
>
> Idea from Jani on irc.

Hah, it was a bit tongue-in-cheek, but works for me!

Ack also on patch 1.

BR,
Jani.

>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  dim.rst | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/dim.rst b/dim.rst
> index be541d80ec7e..87a8906aad8d 100644
> --- a/dim.rst
> +++ b/dim.rst
> @@ -2,9 +2,9 @@
>   dim
>  =====
>  
> ----------------------------
> -drm-intel maintainer script
> ----------------------------
> +--------------------------------
> +drm inglorious maintainer script
> +--------------------------------
>  
>  :Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>  :Author: Jani Nikula <jani.nikula@intel.com>

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/3] drm: Document maintainer duties

[Eric Engestrom]

On Monday, 2017-03-27 10:45:44 +0200, Daniel Vetter wrote:
> I wanted to get Sean Paul to run the drm-misc show for a bit, for
> training reasons and to increase the bus factor. And then realized
> there's no docs about what maintainers are doing.
> 
> Fix that.
> 
> v2: Add backmerges and taking the blame.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  drm-misc.rst | 36 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
> 
> diff --git a/drm-misc.rst b/drm-misc.rst
> index 139d45e92edf..b6d01f2c7c2b 100644
> --- a/drm-misc.rst
> +++ b/drm-misc.rst
> @@ -142,6 +142,42 @@ Slightly different rules apply:
>    more involved rework in follow-up work. This way lengthy review cycles get
>    avoided, which are a drag for both reviewer and author.
>  
> +Maintainer's Duties
> +===================
> +
> +Maintainers mostly provide services to keep drm-misc running smoothly:
> +
> +* Coordinate cross-subsystem depencies and handle topic branches, sending out

s/depencies/dependencies/

> +  pull request and merging topic pull requests from other subsystems.
> +
> +* At least once per week check for pending bugfixes (using ``dim status``) and
> +  if there are any (either in `-fixes` or `-next-fixes`), send out the pull
> +  request.
> +
> +* Fast-forward (when possible) `-fixes` to each released -rc kernel tag, to
> +  keep it current. We try to avoid backmerges for bugfix branches, and rebasing
> +  isn't an option with multiple committers.
> +
> +* During the merge-windo blackout, i.e. from -rc6 on until the merge window

s/windo/window/

> +  closes with the release of -rc1, try to track `drm-next` with the
> +  `-next-fixes` branch. Do not advance past -rc1, otherwise the automagic in
> +  the scripts will push the wrong patches to the linux-next tree.
> +
> +* Between -rc1 and -rc6 send pull requests for the `-next` branch every 1-2
> +  weeks, depending upon how much is queued up.
> +
> +* Backmerge `drm-next` into the `-next` branch when needed, properly recording
> +  that reason in the merge commit message. Do a backmerge at least once per
> +  month to avoid conflict chaos, and specifically merge in the main drm feature
> +  pull request, to resync with all the late driver submissions during the merge
> +  window.
> +
> +* Last resort fallback for applying patches, in case all area expert committers
> +  are somehow unavailable.
> +
> +* Take the blame when something goes wrong. Maintainers interface and represent
> +  the entire group of committers to the wider kernel community.

:)

> +
>  Tooling
>  =======
>  
> -- 
> 2.11.0
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx