summaryrefslogtreecommitdiffstats
path: root/Documentation/maintainer/index.rst
diff options
context:
space:
mode:
authorJonathan Corbet2019-05-29 01:12:51 +0200
committerJonathan Corbet2019-06-18 17:33:16 +0200
commitd95ea1a4e1fb7c7ec44969afaf0d983f8170ebef (patch)
tree3699048b165280f30b9cc71258777d477cb3a5fd /Documentation/maintainer/index.rst
parentblock: document iostat changes for disk busy time accounting (diff)
downloadkernel-qcow2-linux-d95ea1a4e1fb7c7ec44969afaf0d983f8170ebef.tar.gz
kernel-qcow2-linux-d95ea1a4e1fb7c7ec44969afaf0d983f8170ebef.tar.xz
kernel-qcow2-linux-d95ea1a4e1fb7c7ec44969afaf0d983f8170ebef.zip
docs: Add a document on repository management
Every merge window seems to involve at least one episode where subsystem maintainers don't manage their trees as Linus would like. Document the expectations so that at least he has something to point people to. Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/maintainer/index.rst')
-rw-r--r--Documentation/maintainer/index.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/maintainer/index.rst b/Documentation/maintainer/index.rst
index 2a14916930cb..56e2c09dfa39 100644
--- a/Documentation/maintainer/index.rst
+++ b/Documentation/maintainer/index.rst
@@ -10,5 +10,6 @@ additions to this manual.
:maxdepth: 2
configure-git
+ rebasing-and-merging
pull-requests