Skip to content

Commit

Permalink
Update skiboot stable tree rules
Browse files Browse the repository at this point in the history
We have new mailing list (skiboot-stable@lists.ozlabs.org) for handling
stable trees!

Now onwards to submit patches to stable tree, one should send patches to
skiboot-stable@lists.ozlabs.org mailing list with subject prefix
[PATH <stable-version>] -OR- CC skiboot-stable@lists.ozlabs.org mailing
list while sending patches to upstream mailing list (skiboot@lists.ozlabs.org).

This will remove the requirement to do the --suppress-cc OR other related
--no-cc-* options from git-send-email to remove "CC" list.

Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
  • Loading branch information
Vasant Hegde authored and stewartsmith committed Mar 18, 2019
1 parent c470806 commit 2ba5ce8
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions doc/process/stable-skiboot-rules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ What patches are accepted?
HOWTO submit to stable
----------------------
Two ways:
1. Send patch to the skiboot@ list with "[PATCH stable]" in subject
1. Send patch to the skiboot-stable@lists.ozlabs.org list with
"[PATCH <stable version>]" in subject

* This targets the patch *ONLY* to the stable branch.

Expand All @@ -50,18 +51,19 @@ Two ways:
commit <sha1> upstream.
* If the patch has been modified, explain why in description.

2. Add "Cc: stable" above your Signed-off-by line when sending to skiboot@
2. Add "Cc: skiboot-stable@lists.ozlabs.org" above your Signed-off-by line
when sending to skiboot@

* This targets the patch to master and stable.
* You can target a patch to a specific stable tree with: ::

Cc: stable # 5.1.x
Cc: skiboot-stable@lists.ozlabs.org # 5.1.x

and that will target it to the 5.1.x branch.
* You can ask for prerequisites to be cherry-picked: ::

Cc: stable # 5.1.x 55ae15b Ensure we run pollers in cpu_wait_job()
Cc: stable # 5.1.x
Cc: skiboot-stable@lists.ozlabs.org # 5.1.x 55ae15b Ensure we run pollers in cpu_wait_job()
Cc: skiboot-stable@lists.ozlabs.org # 5.1.x

Which means:

Expand Down

0 comments on commit 2ba5ce8

Please sign in to comment.