* [PATCH] Documentation: stable: Document alternative for referring upstream commit hash @ 2022-08-09 4:55 Salvatore Bonaccorso 2022-08-09 8:30 ` Bagas Sanjaya 2022-08-09 12:54 ` Jonathan Corbet 0 siblings, 2 replies; 8+ messages in thread From: Salvatore Bonaccorso @ 2022-08-09 4:55 UTC (permalink / raw) To: Jonathan Corbet Cc: Greg Kroah-Hartman, Sasha Levin, linux-doc, linux-kernel, Salvatore Bonaccorso Additionally to the "commit <sha1> upstream." variant, "[ Upstream commit <sha1> ]" is used as well as alternative to refer to the upstream commit hash. Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> --- 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 c61865e91f52..2fd8aa593a28 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -97,6 +97,12 @@ text, like this: commit <sha1> upstream. +or alternatively: + +.. code-block:: none + + [ Upstream commit <sha1> ] + Additionally, some patches submitted via :ref:`option_1` may have additional patch prerequisites which can be cherry-picked. This can be specified in the following format in the sign-off area: -- 2.36.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] Documentation: stable: Document alternative for referring upstream commit hash 2022-08-09 4:55 [PATCH] Documentation: stable: Document alternative for referring upstream commit hash Salvatore Bonaccorso @ 2022-08-09 8:30 ` Bagas Sanjaya 2022-08-09 8:44 ` Greg Kroah-Hartman 2022-08-09 12:54 ` Jonathan Corbet 1 sibling, 1 reply; 8+ messages in thread From: Bagas Sanjaya @ 2022-08-09 8:30 UTC (permalink / raw) To: Salvatore Bonaccorso, Jonathan Corbet Cc: Greg Kroah-Hartman, Sasha Levin, linux-doc, linux-kernel On 8/9/22 11:55, Salvatore Bonaccorso wrote: > @@ -97,6 +97,12 @@ text, like this: > > commit <sha1> upstream. > > +or alternatively: > + > +.. code-block:: none > + > + [ Upstream commit <sha1> ] > + Looks OK. Indeed Sasha uses the alternative style. Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com> -- An old man doll... just what I always wanted! - Clara ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Documentation: stable: Document alternative for referring upstream commit hash 2022-08-09 8:30 ` Bagas Sanjaya @ 2022-08-09 8:44 ` Greg Kroah-Hartman 0 siblings, 0 replies; 8+ messages in thread From: Greg Kroah-Hartman @ 2022-08-09 8:44 UTC (permalink / raw) To: Bagas Sanjaya Cc: Salvatore Bonaccorso, Jonathan Corbet, Sasha Levin, linux-doc, linux-kernel On Tue, Aug 09, 2022 at 03:30:46PM +0700, Bagas Sanjaya wrote: > On 8/9/22 11:55, Salvatore Bonaccorso wrote: > > @@ -97,6 +97,12 @@ text, like this: > > > > commit <sha1> upstream. > > > > +or alternatively: > > + > > +.. code-block:: none > > + > > + [ Upstream commit <sha1> ] > > + > > Looks OK. Indeed Sasha uses the alternative style. > > Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com> Thanks, I'll queue this up after -rc1 is out. greg k-h ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Documentation: stable: Document alternative for referring upstream commit hash 2022-08-09 4:55 [PATCH] Documentation: stable: Document alternative for referring upstream commit hash Salvatore Bonaccorso 2022-08-09 8:30 ` Bagas Sanjaya @ 2022-08-09 12:54 ` Jonathan Corbet 2022-08-09 13:37 ` Salvatore Bonaccorso 2022-08-26 8:27 ` Salvatore Bonaccorso 1 sibling, 2 replies; 8+ messages in thread From: Jonathan Corbet @ 2022-08-09 12:54 UTC (permalink / raw) To: Salvatore Bonaccorso Cc: Greg Kroah-Hartman, Sasha Levin, linux-doc, linux-kernel, Salvatore Bonaccorso Salvatore Bonaccorso <carnil@debian.org> writes: > Additionally to the "commit <sha1> upstream." variant, "[ Upstream > commit <sha1> ]" is used as well as alternative to refer to the upstream > commit hash. > > Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> > --- > Documentation/process/stable-kernel-rules.rst | 6 ++++++ > 1 file changed, 6 insertions(+) So this is a nit but... > diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst > index c61865e91f52..2fd8aa593a28 100644 > --- a/Documentation/process/stable-kernel-rules.rst > +++ b/Documentation/process/stable-kernel-rules.rst > @@ -97,6 +97,12 @@ text, like this: > > commit <sha1> upstream. > > +or alternatively: > + > +.. code-block:: none > + > + [ Upstream commit <sha1> ] Can this just be: or alternatively:: [ Upstream commit <sha1> ] That extra RST markup just clutters things without any advantage. Thanks, jon ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Documentation: stable: Document alternative for referring upstream commit hash 2022-08-09 12:54 ` Jonathan Corbet @ 2022-08-09 13:37 ` Salvatore Bonaccorso 2022-08-26 8:27 ` Salvatore Bonaccorso 1 sibling, 0 replies; 8+ messages in thread From: Salvatore Bonaccorso @ 2022-08-09 13:37 UTC (permalink / raw) To: Jonathan Corbet; +Cc: Greg Kroah-Hartman, Sasha Levin, linux-doc, linux-kernel Hi Jonathan, On Tue, Aug 09, 2022 at 06:54:59AM -0600, Jonathan Corbet wrote: > Salvatore Bonaccorso <carnil@debian.org> writes: > > > Additionally to the "commit <sha1> upstream." variant, "[ Upstream > > commit <sha1> ]" is used as well as alternative to refer to the upstream > > commit hash. > > > > Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> > > --- > > Documentation/process/stable-kernel-rules.rst | 6 ++++++ > > 1 file changed, 6 insertions(+) > > So this is a nit but... > > > diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst > > index c61865e91f52..2fd8aa593a28 100644 > > --- a/Documentation/process/stable-kernel-rules.rst > > +++ b/Documentation/process/stable-kernel-rules.rst > > @@ -97,6 +97,12 @@ text, like this: > > > > commit <sha1> upstream. > > > > +or alternatively: > > + > > +.. code-block:: none > > + > > + [ Upstream commit <sha1> ] > > Can this just be: > > or alternatively:: > > [ Upstream commit <sha1> ] > > That extra RST markup just clutters things without any advantage. Okay, I just have sent a v2 dropping it. Salvatore ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Documentation: stable: Document alternative for referring upstream commit hash 2022-08-09 12:54 ` Jonathan Corbet 2022-08-09 13:37 ` Salvatore Bonaccorso @ 2022-08-26 8:27 ` Salvatore Bonaccorso 2022-09-01 15:59 ` Greg Kroah-Hartman 1 sibling, 1 reply; 8+ messages in thread From: Salvatore Bonaccorso @ 2022-08-26 8:27 UTC (permalink / raw) To: Jonathan Corbet; +Cc: Greg Kroah-Hartman, Sasha Levin, linux-doc, linux-kernel Hi Jonathan, On Tue, Aug 09, 2022 at 06:54:59AM -0600, Jonathan Corbet wrote: > Salvatore Bonaccorso <carnil@debian.org> writes: > > > Additionally to the "commit <sha1> upstream." variant, "[ Upstream > > commit <sha1> ]" is used as well as alternative to refer to the upstream > > commit hash. > > > > Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> > > --- > > Documentation/process/stable-kernel-rules.rst | 6 ++++++ > > 1 file changed, 6 insertions(+) > > So this is a nit but... > > > diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst > > index c61865e91f52..2fd8aa593a28 100644 > > --- a/Documentation/process/stable-kernel-rules.rst > > +++ b/Documentation/process/stable-kernel-rules.rst > > @@ -97,6 +97,12 @@ text, like this: > > > > commit <sha1> upstream. > > > > +or alternatively: > > + > > +.. code-block:: none > > + > > + [ Upstream commit <sha1> ] > > Can this just be: > > or alternatively:: > > [ Upstream commit <sha1> ] > > That extra RST markup just clutters things without any advantage. Btw, after revisiting, I think Greg actually can pick up the first version of the patch. Changing the above without adding the code-block:node will reformat the [ Upstream commit <sha1> ] differently when rendering to html. Greg, so as the patch has not yet been commited, can you pick up the first version from https://lore.kernel.org/lkml/20220809045543.2049293-1-carnil@debian.org/ ? Regards, Salvatore ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Documentation: stable: Document alternative for referring upstream commit hash 2022-08-26 8:27 ` Salvatore Bonaccorso @ 2022-09-01 15:59 ` Greg Kroah-Hartman 2022-09-01 18:45 ` Salvatore Bonaccorso 0 siblings, 1 reply; 8+ messages in thread From: Greg Kroah-Hartman @ 2022-09-01 15:59 UTC (permalink / raw) To: Salvatore Bonaccorso Cc: Jonathan Corbet, Sasha Levin, linux-doc, linux-kernel On Fri, Aug 26, 2022 at 10:27:58AM +0200, Salvatore Bonaccorso wrote: > Hi Jonathan, > > On Tue, Aug 09, 2022 at 06:54:59AM -0600, Jonathan Corbet wrote: > > Salvatore Bonaccorso <carnil@debian.org> writes: > > > > > Additionally to the "commit <sha1> upstream." variant, "[ Upstream > > > commit <sha1> ]" is used as well as alternative to refer to the upstream > > > commit hash. > > > > > > Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> > > > --- > > > Documentation/process/stable-kernel-rules.rst | 6 ++++++ > > > 1 file changed, 6 insertions(+) > > > > So this is a nit but... > > > > > diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst > > > index c61865e91f52..2fd8aa593a28 100644 > > > --- a/Documentation/process/stable-kernel-rules.rst > > > +++ b/Documentation/process/stable-kernel-rules.rst > > > @@ -97,6 +97,12 @@ text, like this: > > > > > > commit <sha1> upstream. > > > > > > +or alternatively: > > > + > > > +.. code-block:: none > > > + > > > + [ Upstream commit <sha1> ] > > > > Can this just be: > > > > or alternatively:: > > > > [ Upstream commit <sha1> ] > > > > That extra RST markup just clutters things without any advantage. > > Btw, after revisiting, I think Greg actually can pick up the first > version of the patch. Changing the above without adding the > code-block:node will reformat the > > [ Upstream commit <sha1> ] > > differently when rendering to html. > > Greg, so as the patch has not yet been commited, can you pick up the > first version from > https://lore.kernel.org/lkml/20220809045543.2049293-1-carnil@debian.org/ > ? Please resend it as v3 so that our tools don't try to apply v2. thanks, greg k-h ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Documentation: stable: Document alternative for referring upstream commit hash 2022-09-01 15:59 ` Greg Kroah-Hartman @ 2022-09-01 18:45 ` Salvatore Bonaccorso 0 siblings, 0 replies; 8+ messages in thread From: Salvatore Bonaccorso @ 2022-09-01 18:45 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: Jonathan Corbet, Sasha Levin, linux-doc, linux-kernel Hi Greg, On Thu, Sep 01, 2022 at 05:59:08PM +0200, Greg Kroah-Hartman wrote: > On Fri, Aug 26, 2022 at 10:27:58AM +0200, Salvatore Bonaccorso wrote: > > Hi Jonathan, > > > > On Tue, Aug 09, 2022 at 06:54:59AM -0600, Jonathan Corbet wrote: > > > Salvatore Bonaccorso <carnil@debian.org> writes: > > > > > > > Additionally to the "commit <sha1> upstream." variant, "[ Upstream > > > > commit <sha1> ]" is used as well as alternative to refer to the upstream > > > > commit hash. > > > > > > > > Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> > > > > --- > > > > Documentation/process/stable-kernel-rules.rst | 6 ++++++ > > > > 1 file changed, 6 insertions(+) > > > > > > So this is a nit but... > > > > > > > diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst > > > > index c61865e91f52..2fd8aa593a28 100644 > > > > --- a/Documentation/process/stable-kernel-rules.rst > > > > +++ b/Documentation/process/stable-kernel-rules.rst > > > > @@ -97,6 +97,12 @@ text, like this: > > > > > > > > commit <sha1> upstream. > > > > > > > > +or alternatively: > > > > + > > > > +.. code-block:: none > > > > + > > > > + [ Upstream commit <sha1> ] > > > > > > Can this just be: > > > > > > or alternatively:: > > > > > > [ Upstream commit <sha1> ] > > > > > > That extra RST markup just clutters things without any advantage. > > > > Btw, after revisiting, I think Greg actually can pick up the first > > version of the patch. Changing the above without adding the > > code-block:node will reformat the > > > > [ Upstream commit <sha1> ] > > > > differently when rendering to html. > > > > Greg, so as the patch has not yet been commited, can you pick up the > > first version from > > https://lore.kernel.org/lkml/20220809045543.2049293-1-carnil@debian.org/ > > ? > > Please resend it as v3 so that our tools don't try to apply v2. Okay right, make sense! Just sumitted v3 with the original version of the documentation patch. https://lore.kernel.org/lkml/20220901184328.4075701-1-carnil@debian.org/ Regards, Salvatore ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-09-01 18:46 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-08-09 4:55 [PATCH] Documentation: stable: Document alternative for referring upstream commit hash Salvatore Bonaccorso 2022-08-09 8:30 ` Bagas Sanjaya 2022-08-09 8:44 ` Greg Kroah-Hartman 2022-08-09 12:54 ` Jonathan Corbet 2022-08-09 13:37 ` Salvatore Bonaccorso 2022-08-26 8:27 ` Salvatore Bonaccorso 2022-09-01 15:59 ` Greg Kroah-Hartman 2022-09-01 18:45 ` Salvatore Bonaccorso
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).