linux-kernel - [PATCH v2] Doc/stable rules: add new cherry-pick logic

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20091206112431.GA9937@Chamillionaire.breakpoint.cc>
Date:	Sun, 6 Dec 2009 12:24:31 +0100
From:	Sebastian Andrzej Siewior <sebastian@...akpoint.cc>
To:	Greg KH <gregkh@...e.de>
Cc:	Artem Bityutskiy <Artem.Bityutskiy@...ia.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH v2] Doc/stable rules: add new cherry-pick logic

- it is possible to submit patches for the stable queue without sending
  them directly stable@...nel.org. If the tag (Cc: stable@...nel.org) is
  available in the sign-off area than hpa's script will filter them into
  the stable mailbox once it hits Linus' tree.
- Patches which require others to be applied first can be also specified.
  This was discussued in http://lkml.org/lkml/2009/11/9/474

Signed-off-by: Sebastian Andrzej Siewior <sebastian@...akpoint.cc>
---
 Documentation/stable_kernel_rules.txt |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
index a452227..bc52bbb 100644
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
@@ -25,14 +25,32 @@ Rules on what kind of patches are accepted, and which ones are not, into the
 Procedure for submitting patches to the -stable tree:
 
  - Send the patch, after verifying that it follows the above rules, to
-   stable@...nel.org.
+   stable@...nel.org. An alternative is to have the tag
+    Cc: stable@...nel.org
+   in the sign-off area. Once the patch is merged it will be filtered
+   into the stable tree even without sending directly to
+   stable@...nel.org
+ - If the patch requires other patches as prerequisites which can be
+   cherry-picked than this can be specified in the following format in
+   the sign-off area:
+
+    Cc: <stable@...nel.org> # .32.x: a1f84a3: sched: Check for an idle shared cache
+    Cc: <stable@...nel.org> # .32.x: 1b9508f: sched: Rate-limit newidle
+    Cc: <stable@...nel.org> # .32.x: fd21073: sched: Fix affinity logic
+    Cc: <stable@...nel.org> # .32.x
+    Signed-off-by: Ingo Molnar <mingo@...e.hu>
+
+   The tag sequence has the meaning of:
+    git cherry-pick a1f84a3
+    git cherry-pick 1b9508f
+    git cherry-pick fd21073
+    git cherry-pick <this commit>
+
  - The sender will receive an ACK when the patch has been accepted into the
    queue, or a NAK if the patch is rejected.  This response might take a few
    days, according to the developer's schedules.
  - If accepted, the patch will be added to the -stable queue, for review by
    other developers and by the relevant subsystem maintainer.
- - If the stable@...nel.org address is added to a patch, when it goes into
-   Linus's tree it will automatically be emailed to the stable team.
  - Security patches should not be sent to this alias, but instead to the
    documented security@...nel.org address.
 
-- 
1.6.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/