On Mon, Jul 10, 2023 at 07:10:11PM +0200, Thorsten Leemhuis wrote: > Document how to delay backporting or send a note to the stable team > using shell-style inline comments attached to stable tags. > > CC: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> > CC: Sasha Levin <sashal@xxxxxxxxxx> > CC: Jonathan Corbet <corbet@xxxxxxx> > Signed-off-by: Thorsten Leemhuis <linux@xxxxxxxxxxxxx> > --- > Documentation/process/stable-kernel-rules.rst | 22 ++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst > index 51df1197d5ab..6e4026dd6882 100644 > --- a/Documentation/process/stable-kernel-rules.rst > +++ b/Documentation/process/stable-kernel-rules.rst > @@ -55,9 +55,10 @@ To have the patch automatically included in the stable tree, add the tag > > Cc: stable@xxxxxxxxxxxxxxx > > -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. > +in the sign-off area; to accompany a note to the stable team, use a shell-style Is that how a ';' is really used? I never can remember, so it's an honest question here :) > +inline comment (see below for details). 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. > > .. _option_2: > > @@ -139,6 +140,21 @@ The tag has the meaning of: > > For each "-stable" tree starting with the specified version. > > +To delay pick up of patches submitted via :ref:`option_1`, use the following > +format: > + > +.. code-block:: none > + > + Cc: <stable@xxxxxxxxxxxxxxx> # after 4 weeks in mainline > + > +For any other requests related to patches submitted via :ref:`option_1`, just > +add a note to the stable tag. This for example can be used to point out known > +problems: > + > +.. code-block:: none > + > + Cc: <stable@xxxxxxxxxxxxxxx> # see patch description, needs adjustments for >= 6.3 > + This looks great to me, so I'll be glad to take it. thanks, greg k-h
