From nobody Fri Dec 19 10:54:41 2025 Received: from wp530.webpack.hosteurope.de (wp530.webpack.hosteurope.de [80.237.130.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C056010A25; Mon, 29 Apr 2024 07:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.237.130.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375118; cv=none; b=DoRBWdm1VNwj6WnL9GBeVRoi4XtPVLomfMpfonhvWqxYGL03t1I5EfxynvZs5CMqaU2GRdOH8WzJSh1Q8IG1QbkXxRwvejPGnBe1ZWNKJRQ+507PafrKHB8DGmanNtG9dbESQFxc1+bh3KIPnvxT8nInv7mgeTQHm0LD6QUtqok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375118; c=relaxed/simple; bh=FUv8C/H7hY9I+fk/65VVZ7+kKtRRAkdhg7RM70eHSKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EmtxucKp7Ee7czQHrgsUOtjh3LxO1yD9BlyxpV5gbkzYNsJju1ozx3j8XaYvMc9iBysUQTtNl6vlAHqg1Cx7qXtCHQcspwH6GNiOUMb9+axo2z6mJ1EIh8Br4n5eZ2vzgDdHrmRZSIzNR/SYr7AujfcSUo1ndm8d6cUY23UFi/s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info; spf=pass smtp.mailfrom=leemhuis.info; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b=I4IliJyU; arc=none smtp.client-ip=80.237.130.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b="I4IliJyU" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=leemhuis.info; s=he214686; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:From:Sender: Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:In-Reply-To: References; bh=zHxiPlbn8iylFbdHdlasv5xRFVd2Xjc1sCdQba/lytQ=; t=1714375116; x=1714807116; b=I4IliJyUKWOIwiWYMzQ/hDxuV1KkuQf6ivBolodzHzOHp0VgU+jzxnZsPDdSE mvogawIjvc1sR9tARu8/DkaYVoOXCFrio4Dq7CwXjbJrHZTiFRxdD+HTxvso9Ydj1SkKH8Cmw2Yyf c3j8eTJnq6bjBw+dbk1UMssmLXbYGTwjX8MCbiP9SmTw5Qwta/50zlOmZftT5XU8KmlM+EmJ88Q90 azd/Bzv64/mFIOv+fWIjliiqrqbjpTvGk17eEPnYG8YUBSAqO9PJcdnNiJX87hiX/HL5Y/bcm1KGm zWGqDZAQXeeWqx+fdaHxMaPHnZCzYqdna1/lCkiLTkQL/Pa3/w==; Received: from ip4d148da6.dynamic.kabel-deutschland.de ([77.20.141.166] helo=truhe.fritz.box); authenticated by wp530.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1s1LHT-0004e1-Sv; Mon, 29 Apr 2024 09:18:31 +0200 From: Thorsten Leemhuis To: Greg Kroah-Hartman , Sasha Levin Cc: Jonathan Corbet , stable@vger.kernel.org, workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] docs: stable-kernel-rules: reduce redundancy Date: Mon, 29 Apr 2024 09:18:26 +0200 Message-ID: <106e21789e2bf02d174e1715b49cd4d30886d51f.1714367921.git.linux@leemhuis.info> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-bounce-key: webpack.hosteurope.de;linux@leemhuis.info;1714375116;044ac9ba; X-HE-SMSGID: 1s1LHT-0004e1-Sv Content-Type: text/plain; charset="utf-8" Explain the general concept once in the intro to keep things somewhat shorter in the individual points. Reviewed-by: Greg Kroah-Hartman Signed-off-by: Thorsten Leemhuis --- Documentation/process/stable-kernel-rules.rst | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/= process/stable-kernel-rules.rst index 1704f1c686d0a8..0da9c57287c134 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -79,10 +79,9 @@ stable tree without anything else needing to be done by = the author or subsystem maintainer. =20 To sent additional instructions to the stable team, use a shell-style inli= ne -comment: +comment to pass arbitrary or predefined notes: =20 - * To specify any additional patch prerequisites for cherry picking use the - following format in the sign-off area: + * Specify any additional patch prerequisites for cherry picking: =20 .. code-block:: none =20 @@ -114,8 +113,7 @@ comment: prerequisite of patch2 if you have already marked patch1 for stable inclusion. =20 - * For patches that may have kernel version prerequisites specify them usi= ng - the following format in the sign-off area: + * Point out kernel version prerequisites: =20 .. code-block:: none =20 @@ -132,14 +130,13 @@ comment: Note, such tagging is unnecessary if the stable team can derive the appropriate versions from Fixes: tags. =20 - * To delay pick up of patches, use the following format: + * Delay pick up of patches: =20 .. code-block:: none =20 Cc: # after 4 weeks in mainline =20 - * For any other requests, just add a note to the stable tag. This for exa= mple - can be used to point out known problems: + * Point out known problems: =20 .. code-block:: none =20 --=20 2.44.0 From nobody Fri Dec 19 10:54:41 2025 Received: from wp530.webpack.hosteurope.de (wp530.webpack.hosteurope.de [80.237.130.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD7FC134BE; Mon, 29 Apr 2024 07:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.237.130.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375118; cv=none; b=h7Da1d+btlZhW864J6C445X7tdZBKmpg6JtuRGpsVsvHR2jvR9TZX1yf7iCUAZZ76kKTPRlNNewiGdCcjdy3de+ECLmoWoc0p19yGvevkLmmtcOE/GWU8eAbWxVNGQamkItiN+6IqNDe+NTOWJOFDV5cOYwOaT4spWHibU/oU2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375118; c=relaxed/simple; bh=mRJK2AQiE5O8jdME3BVX81Wip+tE76LubZ8HkAoHRzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q7ON2BfFJePoPb0k8ciCzdCnFa/OXYLsiTZYrBgWtgkukCeDcOhWvJl5kwvMX/AyW/a77oDols67fsVb3PYqlODzNM+OQhVJJl3YbNxyQojTBYf3QPWfwo3XFTZQ8AOun60rSr6gnB50fwPoy7say8NPqxKRlPZcKntpQZSOtjg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info; spf=pass smtp.mailfrom=leemhuis.info; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b=fRmFoCzU; arc=none smtp.client-ip=80.237.130.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b="fRmFoCzU" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=leemhuis.info; s=he214686; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:From:Sender: Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:In-Reply-To: References; bh=6Urg+TQ/FnsFc4yBOyVl/MrcHcj+2yeVM0FYIrCt150=; t=1714375117; x=1714807117; b=fRmFoCzU6nJ8Xl+zpoKl9DM2oMLYmmhVo3Y/8iJ07P5lQjjOjbHKGw2N6wwRh +G/MWEpEbvhnlDKD1FcXMV3vWre8MkvLydjEoKfATqV5ibuoVIrbCFcA+pXZNfZR0L8VouXymYDnm cnx0vgzWUJ+R0dBeP+Q/WA92+RjtGa9/QqbV250EDjVLInqZK8/+INOFIcP9KG6U+By2SneTTm1IZ N7ezbXIFbD2OT3vJtzKptMA4Ku9gTbC1TR0+yQ5lD9p58T/7z6peCZZQRrsx73k/ryl6UnXHfXCkb vZlYxk+h9KYuWSrEzKY1hGU0NOVtun+E0jLffIF5xTSZ7B1QZg==; Received: from ip4d148da6.dynamic.kabel-deutschland.de ([77.20.141.166] helo=truhe.fritz.box); authenticated by wp530.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1s1LHU-0004e1-7h; Mon, 29 Apr 2024 09:18:32 +0200 From: Thorsten Leemhuis To: Greg Kroah-Hartman , Sasha Levin Cc: Jonathan Corbet , stable@vger.kernel.org, workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] docs: stable-kernel-rules: call mainline by its name and change example Date: Mon, 29 Apr 2024 09:18:27 +0200 Message-ID: <0a120573ea827aee12d45e7bd802ba85c09884da.1714367921.git.linux@leemhuis.info> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-bounce-key: webpack.hosteurope.de;linux@leemhuis.info;1714375117;b475376d; X-HE-SMSGID: 1s1LHU-0004e1-7h Content-Type: text/plain; charset="utf-8" Fine-tuning: * s/Linus' tree/Linux mainline/, as mainline is the term used elsewhere in the document. * Provide a better example for the 'delayed backporting' case that uses a fixed rather than a relative reference point, which makes it easier to handle for the stable team. Signed-off-by: Thorsten Leemhuis Reviewed-by: Greg Kroah-Hartman --- Documentation/process/stable-kernel-rules.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/= process/stable-kernel-rules.rst index 0da9c57287c134..d28072b570f872 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -6,7 +6,7 @@ Everything you ever wanted to know about Linux -stable rele= ases Rules on what kind of patches are accepted, and which ones are not, into t= he "-stable" tree: =20 - - It or an equivalent fix must already exist in Linus' tree (upstream). + - It or an equivalent fix must already exist in Linux mainline (upstream). - It must be obviously correct and tested. - It cannot be bigger than 100 lines, with context. - It must follow the @@ -134,7 +134,7 @@ comment to pass arbitrary or predefined notes: =20 .. code-block:: none =20 - Cc: # after 4 weeks in mainline + Cc: # after -rc3 =20 * Point out known problems: =20 --=20 2.44.0 From nobody Fri Dec 19 10:54:41 2025 Received: from wp530.webpack.hosteurope.de (wp530.webpack.hosteurope.de [80.237.130.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD7CF134B0; Mon, 29 Apr 2024 07:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.237.130.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375119; cv=none; b=VrFTeNul7N1bpHh5xeC3WPK1olphrmgio7is3bit1E0olHLpCDPOyIAagGPao/pmny2GVp2OHczmJq9EVMIPNog6JmRKNpaFA6zwYM0vUp3+3MUKngJJsFU5HqhFdcjGM5kVyAPmmSu+VBCg2LZMI+pskwz+UpQ/xvT0mt3G9eA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375119; c=relaxed/simple; bh=pkTdCPFPyFQGIM0YbW1TgN0veBd4bLODfLEaaGxTIFY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O/nbIUhNaTK/J+4KzRI0HBaRvCBIw2jt/7ed0511kI3sN4woBLqie/DwfKGgZVpWzyuT2yCHAviuXsgTPjUjU0FROowBT9NhBkb3VQGkb5O3vEMpuO3wIgP6fBo92nEedupA+WwbBYD/qjz62MjBI2g8XY2aNWq91xzDXGMgkx4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info; spf=pass smtp.mailfrom=leemhuis.info; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b=dhzlXPvo; arc=none smtp.client-ip=80.237.130.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b="dhzlXPvo" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=leemhuis.info; s=he214686; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:From:Sender: Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:In-Reply-To: References; bh=OPqX/QH/B+ex+KDquokfbHorkpVO9YGgihZVxMtqQjQ=; t=1714375117; x=1714807117; b=dhzlXPvoxcaD3ViVYBSzoVUo+UmWRmOYiyAQzXaR7A6AhCilY4EIGKsgXxbnA L5U7HoBqyzleCUm3u9SN+ibjr7h1peI0L+5xh1Qe9n7Y/LmF91YRl2KiUxtcsVd/W/7vti7Rl9uoo z18rSSSE5tmHFn5Q5mUeIwlzgRw0Frcj/X0dnYmdaZfef0AYHFv/CnD+Bt+OYT6YEBWnAkhy86oz4 kSiupZupsid+wZFvlpIIr83GxSHIal5VfBrC+WJlFg4OD39ZU2a9UkK9HNc33gz+Z7VzlRXWkFm+9 AKURwqp6ed+/+XhvH8NIViklhIm2wtC6QAsZVhZMSBOerfrOFQ==; Received: from ip4d148da6.dynamic.kabel-deutschland.de ([77.20.141.166] helo=truhe.fritz.box); authenticated by wp530.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1s1LHU-0004e1-HZ; Mon, 29 Apr 2024 09:18:32 +0200 From: Thorsten Leemhuis To: Greg Kroah-Hartman , Sasha Levin Cc: Jonathan Corbet , stable@vger.kernel.org, workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] docs: stable-kernel-rules: remove code-labels tags and a indention level Date: Mon, 29 Apr 2024 09:18:28 +0200 Message-ID: <755afbeafc8e1457154cb4b30ff4397f34326679.1714367921.git.linux@leemhuis.info> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-bounce-key: webpack.hosteurope.de;linux@leemhuis.info;1714375117;b475376d; X-HE-SMSGID: 1s1LHU-0004e1-HZ Content-Type: text/plain; charset="utf-8" Remove the 'code-block:: none' labels and switch to the shorter '::' to reduce noise. Remove a unneeded level of indentation, as that reduces the chance that readers have to scroll sideways in some of the code blocks. No text changes. Rendered html output looks like before, except for the different level of indentation. CC: Jonathan Corbet Signed-off-by: Thorsten Leemhuis Reviewed-by: Greg Kroah-Hartman --- Documentation/process/stable-kernel-rules.rst | 225 ++++++++---------- 1 file changed, 102 insertions(+), 123 deletions(-) diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/= process/stable-kernel-rules.rst index d28072b570f872..b4af627154f1d8 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -6,29 +6,29 @@ Everything you ever wanted to know about Linux -stable re= leases Rules on what kind of patches are accepted, and which ones are not, into t= he "-stable" tree: =20 - - It or an equivalent fix must already exist in Linux mainline (upstream). - - It must be obviously correct and tested. - - It cannot be bigger than 100 lines, with context. - - It must follow the - :ref:`Documentation/process/submitting-patches.rst ` - rules. - - It must either fix a real bug that bothers people or just add a device = ID. - To elaborate on the former: - - - It fixes a problem like an oops, a hang, data corruption, a real secu= rity - issue, a hardware quirk, a build error (but not for things marked - CONFIG_BROKEN), or some "oh, that's not good" issue. - - Serious issues as reported by a user of a distribution kernel may also - be considered if they fix a notable performance or interactivity issu= e. - As these fixes are not as obvious and have a higher risk of a subtle - regression they should only be submitted by a distribution kernel - maintainer and include an addendum linking to a bugzilla entry if it - exists and additional information on the user-visible impact. - - No "This could be a problem..." type of things like a "theoretical ra= ce - condition", unless an explanation of how the bug can be exploited is = also - provided. - - No "trivial" fixes without benefit for users (spelling changes, white= space - cleanups, etc). +- It or an equivalent fix must already exist in Linux mainline (upstream). +- It must be obviously correct and tested. +- It cannot be bigger than 100 lines, with context. +- It must follow the + :ref:`Documentation/process/submitting-patches.rst ` + rules. +- It must either fix a real bug that bothers people or just add a device I= D. + To elaborate on the former: + + - It fixes a problem like an oops, a hang, data corruption, a real secur= ity + issue, a hardware quirk, a build error (but not for things marked + CONFIG_BROKEN), or some "oh, that's not good" issue. + - Serious issues as reported by a user of a distribution kernel may also + be considered if they fix a notable performance or interactivity issue. + As these fixes are not as obvious and have a higher risk of a subtle + regression they should only be submitted by a distribution kernel + maintainer and include an addendum linking to a bugzilla entry if it + exists and additional information on the user-visible impact. + - No "This could be a problem..." type of things like a "theoretical race + condition", unless an explanation of how the bug can be exploited is a= lso + provided. + - No "trivial" fixes without benefit for users (spelling changes, whites= pace + cleanups, etc). =20 =20 Procedure for submitting patches to the -stable tree @@ -42,11 +42,11 @@ Procedure for submitting patches to the -stable tree =20 There are three options to submit a change to -stable trees: =20 - 1. Add a 'stable tag' to the description of a patch you then submit for - mainline inclusion. - 2. Ask the stable team to pick up a patch already mainlined. - 3. Submit a patch to the stable team that is equivalent to a change alrea= dy - mainlined. +1. Add a 'stable tag' to the description of a patch you then submit for + mainline inclusion. +2. Ask the stable team to pick up a patch already mainlined. +3. Submit a patch to the stable team that is equivalent to a change already + mainlined. =20 The sections below describe each of the options in more detail. =20 @@ -68,79 +68,62 @@ Option 1 ******** =20 To have a patch you submit for mainline inclusion later automatically pick= ed up -for stable trees, add the tag +for stable trees, add this tag in the sign-off area:: =20 -.. code-block:: none + Cc: stable@vger.kernel.org =20 - Cc: stable@vger.kernel.org - -in the sign-off area. Once the patch is mainlined it will be applied to the -stable tree without anything else needing to be done by the author or -subsystem maintainer. +Once the patch is mainlined it will be applied to the stable tree without +anything else needing to be done by the author or subsystem maintainer. =20 To sent additional instructions to the stable team, use a shell-style inli= ne comment to pass arbitrary or predefined notes: =20 - * Specify any additional patch prerequisites for cherry picking: - - .. code-block:: none - - Cc: # 3.3.x: a1f84a3: sched: Check for idle - Cc: # 3.3.x: 1b9508f: sched: Rate-limit newi= dle - Cc: # 3.3.x: fd21073: sched: Fix affinity lo= gic - Cc: # 3.3.x - Signed-off-by: Ingo Molnar - - The tag sequence has the meaning of: - - .. code-block:: none +* Specify any additional patch prerequisites for cherry picking:: =20 - git cherry-pick a1f84a3 - git cherry-pick 1b9508f - git cherry-pick fd21073 - git cherry-pick + Cc: # 3.3.x: a1f84a3: sched: Check for idle + Cc: # 3.3.x: 1b9508f: sched: Rate-limit newid= le + Cc: # 3.3.x: fd21073: sched: Fix affinity log= ic + Cc: # 3.3.x + Signed-off-by: Ingo Molnar =20 - Note that for a patch series, you do not have to list as prerequisites = the - patches present in the series itself. For example, if you have the foll= owing - patch series: + The tag sequence has the meaning of:: =20 - .. code-block:: none + git cherry-pick a1f84a3 + git cherry-pick 1b9508f + git cherry-pick fd21073 + git cherry-pick =20 - patch1 - patch2 + Note that for a patch series, you do not have to list as prerequisites t= he + patches present in the series itself. For example, if you have the follo= wing + patch series:: =20 - where patch2 depends on patch1, you do not have to list patch1 as - prerequisite of patch2 if you have already marked patch1 for stable - inclusion. + patch1 + patch2 =20 - * Point out kernel version prerequisites: + where patch2 depends on patch1, you do not have to list patch1 as + prerequisite of patch2 if you have already marked patch1 for stable + inclusion. =20 - .. code-block:: none +* Point out kernel version prerequisites:: =20 - Cc: # 3.3.x + Cc: # 3.3.x =20 - The tag has the meaning of: + The tag has the meaning of:: =20 - .. code-block:: none + git cherry-pick =20 - git cherry-pick + For each "-stable" tree starting with the specified version. =20 - For each "-stable" tree starting with the specified version. + Note, such tagging is unnecessary if the stable team can derive the + appropriate versions from Fixes: tags. =20 - Note, such tagging is unnecessary if the stable team can derive the - appropriate versions from Fixes: tags. +* Delay pick up of patches:: =20 - * Delay pick up of patches: + Cc: # after -rc3 =20 - .. code-block:: none +* Point out known problems:: =20 - Cc: # after -rc3 - - * Point out known problems: - - .. code-block:: none - - Cc: # see patch description, needs adjustmen= ts for <=3D 6.3 + Cc: # see patch description, needs adjustment= s for <=3D 6.3 =20 .. _option_2: =20 @@ -160,17 +143,13 @@ Option 3 Send the patch, after verifying that it follows the above rules, to stable@vger.kernel.org and mention the kernel versions you wish it to be a= pplied to. When doing so, you must note the upstream commit ID in the changelog o= f your -submission with a separate line above the commit text, like this: - -.. code-block:: none - - commit upstream. +submission with a separate line above the commit text, like this:: =20 -or alternatively: + commit upstream. =20 -.. code-block:: none +Or alternatively:: =20 - [ Upstream commit ] + [ Upstream commit ] =20 If the submitted patch deviates from the original upstream patch (for exam= ple because it had to be adjusted for the older API), this must be very clearly @@ -191,55 +170,55 @@ developers and by the relevant subsystem maintainer. Review cycle ------------ =20 - - When the -stable maintainers decide for a review cycle, the patches wil= l be - sent to the review committee, and the maintainer of the affected area of - the patch (unless the submitter is the maintainer of the area) and CC: = to - the linux-kernel mailing list. - - The review committee has 48 hours in which to ACK or NAK the patch. - - If the patch is rejected by a member of the committee, or linux-kernel - members object to the patch, bringing up issues that the maintainers and - members did not realize, the patch will be dropped from the queue. - - The ACKed patches will be posted again as part of release candidate (-r= c) - to be tested by developers and testers. - - Usually only one -rc release is made, however if there are any outstand= ing - issues, some patches may be modified or dropped or additional patches m= ay - be queued. Additional -rc releases are then released and tested until no - issues are found. - - Responding to the -rc releases can be done on the mailing list by sendi= ng - a "Tested-by:" email with any testing information desired. The "Tested-= by:" - tags will be collected and added to the release commit. - - At the end of the review cycle, the new -stable release will be released - containing all the queued and tested patches. - - Security patches will be accepted into the -stable tree directly from t= he - security kernel team, and not go through the normal review cycle. - Contact the kernel security team for more details on this procedure. +- When the -stable maintainers decide for a review cycle, the patches will= be + sent to the review committee, and the maintainer of the affected area of + the patch (unless the submitter is the maintainer of the area) and CC: to + the linux-kernel mailing list. +- The review committee has 48 hours in which to ACK or NAK the patch. +- If the patch is rejected by a member of the committee, or linux-kernel + members object to the patch, bringing up issues that the maintainers and + members did not realize, the patch will be dropped from the queue. +- The ACKed patches will be posted again as part of release candidate (-rc) + to be tested by developers and testers. +- Usually only one -rc release is made, however if there are any outstandi= ng + issues, some patches may be modified or dropped or additional patches may + be queued. Additional -rc releases are then released and tested until no + issues are found. +- Responding to the -rc releases can be done on the mailing list by sending + a "Tested-by:" email with any testing information desired. The "Tested-b= y:" + tags will be collected and added to the release commit. +- At the end of the review cycle, the new -stable release will be released + containing all the queued and tested patches. +- Security patches will be accepted into the -stable tree directly from the + security kernel team, and not go through the normal review cycle. + Contact the kernel security team for more details on this procedure. =20 =20 Trees ----- =20 - - The queues of patches, for both completed versions and in progress - versions can be found at: +- The queues of patches, for both completed versions and in progress + versions can be found at: =20 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git + https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git =20 - - The finalized and tagged releases of all stable kernels can be found - in separate branches per version at: +- The finalized and tagged releases of all stable kernels can be found + in separate branches per version at: =20 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git + https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git =20 - - The release candidate of all stable kernel versions can be found at: +- The release candidate of all stable kernel versions can be found at: =20 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stabl= e-rc.git/ + https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc= .git/ =20 - .. warning:: - The -stable-rc tree is a snapshot in time of the stable-queue tree a= nd - will change frequently, hence will be rebased often. It should only = be - used for testing purposes (e.g. to be consumed by CI systems). + .. warning:: + The -stable-rc tree is a snapshot in time of the stable-queue tree and + will change frequently, hence will be rebased often. It should only be + used for testing purposes (e.g. to be consumed by CI systems). =20 =20 Review committee ---------------- =20 - - This is made up of a number of kernel developers who have volunteered f= or - this task, and a few that haven't. +- This is made up of a number of kernel developers who have volunteered for + this task, and a few that haven't. --=20 2.44.0 From nobody Fri Dec 19 10:54:41 2025 Received: from wp530.webpack.hosteurope.de (wp530.webpack.hosteurope.de [80.237.130.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C059412E74; Mon, 29 Apr 2024 07:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.237.130.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375119; cv=none; b=djL4agYBpTOh2Uceoh/of0nREGl0X05/BfzTbxKHmSLoKqG3aQEuGbQR5bW96zMcoL1cNmsyq4+pA14HRGW+itMBb5GnvOiDzBnB6ForC+OVMywpPwBq2EcdAK2Mudn37esnVBiLCE5xhst3Mngygm52rdCnci2IKZvw3QbbpZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375119; c=relaxed/simple; bh=6AqRK4s+/gqcB8HzuTUSB8hZRa2UQEfkA8i5t+vDrd0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VCbXFN8Yb9RtZasfNTGRigkwWC42+pskgEXH9F0T9WfcgD6xidYsNXLmVbsws9mbGNpOTud+LobI2E8AGnPC7G2AjOXm5XI38iLhO5T/WfmXBzg/WTCTF7NsFa7OBjYhNbekQf6stTRkwTI/4ckDRwgIKuz5rz2hjraRFLxmA94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info; spf=pass smtp.mailfrom=leemhuis.info; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b=SXubuxsN; arc=none smtp.client-ip=80.237.130.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b="SXubuxsN" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=leemhuis.info; s=he214686; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:From:Sender: Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:In-Reply-To: References; bh=iK5q2DNeaWz8v/Rr1pJ400p0iaZpSMomthypDMAXlFY=; t=1714375116; x=1714807116; b=SXubuxsNBTGvY/eO3GSmCqGuFMkRfqUHVVucW+zPtMCdn1uUhRLfXMU/Cwzxs muthR0bptu+4JrprektYBDoE9kGKec6T11WbZbRwVhz/r3xEkc6uUfXwOrB0KBb+gBl4crxnUCW8j dpyjFP2exmdKik28GnPljKHJ282+HxsTBTsPFrg1NcSIYIEKT4uOEH6glM8Dlt9vJLUOpVviQHKUc MJwfVO6dQpEEtVATtOkW+HcyW+/AkSnT1IG2QbeqOaxHbs04KIuZdxhe8HXmkWJTJkyu23FMwsccE rK+lmbuIZwfIRdN6huxV5Xx6UGvAk58o+4yphP1dj8sMN03ImQ==; Received: from ip4d148da6.dynamic.kabel-deutschland.de ([77.20.141.166] helo=truhe.fritz.box); authenticated by wp530.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1s1LHU-0004e1-VX; Mon, 29 Apr 2024 09:18:33 +0200 From: Thorsten Leemhuis To: Greg Kroah-Hartman , Sasha Levin Cc: Jonathan Corbet , stable@vger.kernel.org, workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] docs: stable-kernel-rules: explain use of stable@kernel.org (w/o @vger.) Date: Mon, 29 Apr 2024 09:18:29 +0200 Message-ID: <6783b71da48aac5290756343f58591dc42da87bc.1714367921.git.linux@leemhuis.info> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-bounce-key: webpack.hosteurope.de;linux@leemhuis.info;1714375116;044ac9ba; X-HE-SMSGID: 1s1LHU-0004e1-VX Content-Type: text/plain; charset="utf-8" Document when to use of stable@kernel.org instead of stable@vger.kernel.org, as the two are easily mixed up and their difference not explained anywhere[1]. Link: https://lore.kernel.org/all/20240422231550.3cf5f723@sal.lan/ [1] Signed-off-by: Thorsten Leemhuis Reviewed-by: Greg Kroah-Hartman --- Documentation/process/stable-kernel-rules.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/= process/stable-kernel-rules.rst index b4af627154f1d8..ebf4152659f2d0 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -72,6 +72,10 @@ for stable trees, add this tag in the sign-off area:: =20 Cc: stable@vger.kernel.org =20 +Use ``Cc: stable@kernel.org`` instead when fixing unpublished vulnerabilit= ies: +it reduces the chance of accidentally exposing the fix to the public by wa= y of +'git send-email', as mails sent to that address are not delivered anywhere. + Once the patch is mainlined it will be applied to the stable tree without anything else needing to be done by the author or subsystem maintainer. =20 --=20 2.44.0 From nobody Fri Dec 19 10:54:41 2025 Received: from wp530.webpack.hosteurope.de (wp530.webpack.hosteurope.de [80.237.130.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F352913AC5; Mon, 29 Apr 2024 07:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.237.130.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375118; cv=none; b=CwFWvwZjMOWmyUptSjDvU9N48vekVeSxoN70YWdGVx6GHA26TboN6HIJZGrXROYQ4umjWOgoUj2espplcIeh+UsoIb1USsmAVfIJLtxuEVJtsMxL11VBXxetBgde+/ZHRwegv4IhCreL4fYM2K31j/ZBTkFJ0Fv9a1ijhVh3NpQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714375118; c=relaxed/simple; bh=lTfHUa+6X3dBbbyMHNjxRT794QlSydTwuuVcDpoSGiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CDs2tQUPmRq73flQFLKyshs7YL4raUxGPJcAgZQ6SYrQF1rIC6OCmJ14FXnpprbbyCcNMravBH1n2jRGIBLnsNlL2aVa9HKCQZmmcmGjqWbBX/xdgvnxbTnZXo3VQXWPMpKOT2uzHSQPoiN0EmCRDmyGCJvZysbzMUBZnYYTfEU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info; spf=pass smtp.mailfrom=leemhuis.info; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b=foPejAjy; arc=none smtp.client-ip=80.237.130.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=leemhuis.info Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=leemhuis.info header.i=@leemhuis.info header.b="foPejAjy" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=leemhuis.info; s=he214686; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:From:Sender: Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:In-Reply-To: References; bh=v4MB+irPk//D9YryabZUxAaUkrcUIos/DQ/+395gmH4=; t=1714375117; x=1714807117; b=foPejAjyBmSo2ZG3HPi5DU+Xdkgrr+5bW/86BesxCGJVlffyNpz8ywiga2Rlg y65Z8ghV4llz3A/CpJjLpUtqUN9R+STkB9EHXHNcwIufNL+nIpoB1KmpG21uZnp5PZOQJqqh0g2RR b/PBNMYo2DN+Ic3UNR9g3ovR1oElmQN48PmEcM8a4wyePzpsisGSWcWWo3IF3Vpqqhw/1R0civIVX nQiV3FcctnKLMnKFq/9upgjFM0nhHLwMjDUrWCBbEY0Vf6GnsT8t+e216cfdai34OAcEWyailiTcd hvN4aOWC5/TPgMTq3sQ2fCidivm+JhsvlFMIoJe1jO9SEdnENw==; Received: from ip4d148da6.dynamic.kabel-deutschland.de ([77.20.141.166] helo=truhe.fritz.box); authenticated by wp530.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1s1LHV-0004e1-Ah; Mon, 29 Apr 2024 09:18:33 +0200 From: Thorsten Leemhuis To: Greg Kroah-Hartman , Sasha Levin Cc: Jonathan Corbet , stable@vger.kernel.org, workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] docs: stable-kernel-rules: create special tag to flag 'no backporting' Date: Mon, 29 Apr 2024 09:18:30 +0200 Message-ID: <35989d3b2f3f8cf23828b0c84fde9b17a74be97c.1714367921.git.linux@leemhuis.info> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-bounce-key: webpack.hosteurope.de;linux@leemhuis.info;1714375117;b475376d; X-HE-SMSGID: 1s1LHV-0004e1-Ah Content-Type: text/plain; charset="utf-8" Document a new variant of the stable tag developers can use to make the stable team's tools ignore a change[1]. That way developers can use 'Fixes:' tags without fearing the changes might be backported in semi-automatic fashion. Such concerns are the reason why some developers deliberately omit the 'Fixes:' tag in changes[2] -- which somewhat undermines the reason for the existence of that tag and might be unwise in the long term[3]. Link: https://lore.kernel.org/all/b452fd54-fdc6-47e4-8c26-6627f6b7eff3@leem= huis.info/ [1] Link: https://lore.kernel.org/all/cover.1712226175.git.antony.antony@secune= t.com/ [2] Link: https://lore.kernel.org/all/dfd87673-c581-4b4b-b37a-1cf5c817240d@leem= huis.info/ [3] Signed-off-by: Thorsten Leemhuis Reviewed-by: Greg Kroah-Hartman --- A patch to make one of the stable-script honor the flag can be found in https://lore.kernel.org/all/655ce2a3-eb04-4ade-999e-23fc5dc5fb3a@leemhuis.i= nfo/ For autosel I was unable to locate the code. --- Documentation/process/stable-kernel-rules.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/= process/stable-kernel-rules.rst index ebf4152659f2d0..9ca8083b41c7f1 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -129,6 +129,12 @@ comment to pass arbitrary or predefined notes: =20 Cc: # see patch description, needs adjustment= s for <=3D 6.3 =20 +There furthermore is a variant of the stable tag you can use to make the s= table +team's backporting tools (e.g AUTOSEL or scripts that look for commits +containing a 'Fixes:' tag) ignore a change:: + + Cc: # reason goes here, and must be pre= sent + .. _option_2: =20 Option 2 --=20 2.44.0