[PATCH rdma-core] Documentation: add documentation about stable branches

[PATCH rdma-core] Documentation: add documentation about stable branches

[Nicolas Morey-Chaisemartin]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=windows-1252, Size: 3783 bytes --]

Add doc file to detail the stable- process: release, submission.

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---

The nice version without markup can be seen here: https://github.com/nmorey/rdma-core/blob/dev/master/stable-guide/Documentation/stable.md

 Documentation/stable.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 Documentation/stable.md

diff --git a/Documentation/stable.md b/Documentation/stable.md
new file mode 100644
index 00000000..b9405848
--- /dev/null
+++ b/Documentation/stable.md
@@ -0,0 +1,64 @@
+# Stable Branch Release
+
+
+## General
+
+Current Maintainer: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-l3A5Bk7waGM@public.gmane.org>
+
+Upstream rdma-core is considered stable after each mainline release.
+Branched stable releases, off a mainline release, are on as-needed basis and limited to bug fixes only.
+
+All bug fixes are to be backported from mainline and applied by stable branch maintainer.
+
+Branched stable releases will append an additional release number (e.g. 15.1) and will ensure that Travis CI reports a successful build.
+
+Regular stable releases will be generated at the same time as mainline releases.
+Additional stable releases can be generated if the need arise (Needed by distributions or OFED).
+
+## Patch Rules
+
+ * It must be obviously correct and tested.
+ * It cannot be bigger than 100 lines, with context.
+ * It must fix only one thing.
+ * It must fix a real bug that bothers people (not a, “This could be a problem...” type thing).
+
+## Submitting to the stable branch
+
+Submissions to the stable branch follow the same process as [kernel-stable](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst).
+
+### Option 1
+
+Patches sent to master should add the tag:
+
+   `Cc: stable-Xl5UnYtxxKxKUA01WzcqbQ@public.gmane.org`
+
+in the sign-off area. Once the patch is merged, it will be applied to the stable tree
+without anything else needing to be done by the author or subsystem maintainer.
+
+If the patch should be applied to more than one release, add the info version as such:
+
+   `Cc: stable-Xl5UnYtxxKxKUA01WzcqbQ@public.gmane.org # v15.1 v14`
+
+
+### Option 2
+
+After the patch has been merged to master, send an email to
+stable-Xl5UnYtxxKxKUA01WzcqbQ@public.gmane.org containing the subject of the patch, the commit ID,
+why you think it should be applied, and what rdma-core version you wish it to
+be applied to.
+
+### Option 3
+
+Send the patch, after verifying that it follows the above rules, to stable-Xl5UnYtxxKxKjwt+cz+3dw@public.gmane.org
+You must note the upstream commit ID in the changelog of your submission,
+ as well as the rdma-core version you wish it to be applied to.
+
+Option 1 is strongly preferred, is the easiest and most common.
+Option 2 and Option 3 are more useful if the patch isn’t deemed worthy at the time it is applied to a public git tree (for instance, because it deserves more regression testing first).
+Option 3 is especially useful if the patch needs some special handling to apply to an older version.
+
+Note that for Option 3, if the patch deviates from the original upstream patch (for example because it had to be backported) this must be very clearly documented and justified in the patch description.
+
+## Versioning
+
+See versioning.md for setting package version on a stable branch.
\ No newline at end of file
-- 
2.15.0.169.g3d3eebb67.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH rdma-core] Documentation: add documentation about stable branches

[Jason Gunthorpe]

On Mon, Nov 13, 2017 at 06:03:39PM +0100, Nicolas Morey-Chaisemartin wrote:
> Add doc file to detail the stable- process: release, submission.

I'm fine with this doc file

> + * It must fix a real bug that bothers people (not a, “This could be a problem...� type thing).
                                                         ^^^^^

Can you fix your mailer? It is sending UTF-8 but setting

Content-Type: text/plain; charset=windows-1252

Which results in mangled patches..

https://superuser.com/questions/288571/how-can-i-change-the-default-encoding-type-thunderbird-uses-when-composing-a-new

Maybe please send this patch as a PR to make sure it doesn't get
mangled?

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH rdma-core] Documentation: add documentation about stable branches

[Benjamin Drung]

Am Montag, den 13.11.2017, 18:03 +0100 schrieb Nicolas Morey-
Chaisemartin:
> Add doc file to detail the stable- process: release, submission.
> 
> Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-WDPRK7U/wSs@public.gmane.org
> m>
> ---
> 
> The nice version without markup can be seen here: https://github.com/
> nmorey/rdma-core/blob/dev/master/stable-guide/Documentation/stable.md
> 
>  Documentation/stable.md | 64
> +++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 64 insertions(+)
>  create mode 100644 Documentation/stable.md
> 
> diff --git a/Documentation/stable.md b/Documentation/stable.md
> new file mode 100644
> index 00000000..b9405848
> --- /dev/null
> +++ b/Documentation/stable.md
> @@ -0,0 +1,64 @@
> [...]
> +See versioning.md for setting package version on a stable branch.
> \ No newline at end of file

Please add a newline at the end of the stable.md file.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org
URL: https://www.profitbricks.de

Sitz der Gesellschaft: Berlin
Registergericht: Amtsgericht Charlottenburg, HRB 125506 B
Geschäftsführer: Achim Weiss, Matthias Steinberg
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH rdma-core] Documentation: add documentation about stable branches

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

On Mon, Nov 13, 2017 at 06:03:39PM +0100, Nicolas Morey-Chaisemartin wrote:
> Add doc file to detail the stable- process: release, submission.
>
> Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
> ---
>

Thanks, applied

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]