Skip to content
Snippets Groups Projects
Commit 4e665ca8 authored by Jani Nikula's avatar Jani Nikula Committed by Jani Nikula
Browse files

doc: move drm maintainer guidelines under maintainer guidelines


This info is for maintainers, not really about repositories.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent c009f8fe
No related branches found
No related tags found
1 merge request!62maintainer tools documentation overhaul
......@@ -9,6 +9,7 @@ This document gathers together maintainer guidelines.
.. toctree::
:maxdepth: 2
maintainer-drm
maintainer-drm-misc
maintainer-drm-intel
maintainer-drm-xe
.. _maintainer-drm:
=========================
drm Maintainer Guidelines
=========================
Backmerges
==========
All backmerges for `-next` trees should first land in `drm-next`, with an
explicit merge commit. This includes pull requests from driver trees based on
newer upstream. In that case first apply the backmerge, then take the pull
request.
Only exception is right after -rc1 when `drm-next` reopens for features, where a
fast-forward is all that's needed.
Only backmerge tagged releases.
Pull Request Review
===================
Special care should be taken to review commits which:
- Touch files outside of what the maintainer maintains (drm core code, other
drivers, or even other subsystems).
- Not reviewed patches - occasionally the lack of review is a process fumble and
patches never even made it to any list.
- Changing uapi. Look both for include/uapi and anything adding new KMS
properties.
- Check for last-minute rebases (all the patches have roughly the same commit
timestamp). Especially rebasing onto latest upstream right before sending out
is discouraged by Linus (since it invalidates the testing that happened).
FIXME: Script as much as possible of the above.
Opens
=====
- Lots of the above needs to be discussed.
- Hard rule against being both drm and sub-tree maintainer, to prevent glaring
conflicts of interest? Commit rights for Dave in drm-misc?
- To rebase or not to rebase (probably no, except the tree is on fire)
- Recipient list for pulls to Linus (Daniel botched this, should be scripted?)
......@@ -49,48 +49,3 @@ drm-fixes
This is the branch where all the fixes for the DRM core and all the GPU drivers
for the current development kernels are merged. drm-fixes is usually merged to
Linus' master on a weekly basis.
Backmerges
==========
All backmerges for `-next` trees should first land in `drm-next`, with an
explicit merge commit. This includes pull requests from driver trees based on
newer upstream. In that case first apply the backmerge, then take the pull
request.
Only exception is right after -rc1 when `drm-next` reopens for features, where a
fast-forward is all that's needed.
Only backmerge tagged releases.
Pull Request Review
===================
Special care should be taken to review commits which:
- Touch files outside of what the maintainer maintains (drm core code, other
drivers, or even other subsystems).
- Not reviewed patches - occasionally the lack of review is a process fumble and
patches never even made it to any list.
- Changing uapi. Look both for include/uapi and anything adding new KMS
properties.
- Check for last-minute rebases (all the patches have roughly the same commit
timestamp). Especially rebasing onto latest upstream right before sending out
is discouraged by Linus (since it invalidates the testing that happened).
FIXME: Script as much as possible of the above.
Opens
=====
- Lots of the above needs to be discussed.
- Hard rule against being both drm and sub-tree maintainer, to prevent glaring
conflicts of interest? Commit rights for Dave in drm-misc?
- To rebase or not to rebase (probably no, except the tree is on fire)
- Recipient list for pulls to Linus (Daniel botched this, should be scripted?)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment