From: Michael Opdenacker <michael.opdenacker@bootlin.com>
To: Roland Hieber <rhi@pengutronix.de>
Cc: yocto@pengutronix.de, docs@lists.yoctoproject.org
Subject: Re: [docs] [PATCH 4/4] contributor-guide: deprecate "Accepted" patch status
Date: Wed, 20 Sep 2023 16:25:25 +0200 [thread overview]
Message-ID: <12ef125b-5466-408c-ec8c-c5bef1510bc7@bootlin.com> (raw)
In-Reply-To: <20230920100647.1038583-4-rhi@pengutronix.de>
On 20.09.23 at 12:06, Roland Hieber wrote:
> This is in accordance with the Release Notes of the gatesgarth release:
>
> > In the ``Upstream-Status`` header convention for patches,
> > ``Accepted`` has | been replaced with ``Backport`` as these almost
> > always mean the same thing i.e. the patch is already upstream and
> > may need to be removed in a future recipe upgrade. If you are adding
> > these headers to your own patches then use Backport to indicate that
> > the patch has been sent upstream.
>
> <https://docs.yoctoproject.org/migration-guides/migration-3.2.html#miscellaneous-changes>
>
> Suggested-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> .../contributor-guide/recipe-style-guide.rst | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/documentation/contributor-guide/recipe-style-guide.rst b/documentation/contributor-guide/recipe-style-guide.rst
> index bc14c58a9759..ab3b94f02e7e 100644
> --- a/documentation/contributor-guide/recipe-style-guide.rst
> +++ b/documentation/contributor-guide/recipe-style-guide.rst
> @@ -277,13 +277,13 @@ following status strings:
> Submitted to upstream, waiting for approval. Optionally include where
> it was submitted, such as the author, mailing list, etc.
>
> -``Accepted``
> - Accepted in upstream, expect it to be removed at next update, include
> - expected version info.
> +``Backport [version]``
> + Accepted upstream and included in the next release, or backported from newer
> + upstream version, because we are at a fixed version.
> + Include upstream version info (e.g. commit ID or next expected version).
>
> -``Backport``
> - Backported from new upstream version, because we are at a fixed version,
> - include upstream version info.
> + Note: historically, ``Accepted`` was another way to mark such patches, but
> + this status is now deprecated.
I'd remove these last 2 lines, as we'd have to remove them one day
anyway, to keep the manual going straight to the point.
The rest looks good to me otherwise.
I actually started to make the changes by myself, but then it was hard
to share these changes with you and other reviewers. I hope this can
help with future patches :)
Maybe in a V3 you can add what Alex explained about the "Pending" status.
Thanks for everything!
Cheers
Michael.
--
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2023-09-20 14:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 10:06 [PATCH 1/4] contributor-guide: recipe-style-guide: add section about CVE patches Roland Hieber
2023-09-20 10:06 ` [PATCH 2/4] contributor-guide: recipe-style-guide: add some more patch tagging examples Roland Hieber
2023-09-20 14:16 ` [docs] " Michael Opdenacker
2023-09-21 8:52 ` Roland Hieber
2023-09-22 9:25 ` Michael Opdenacker
2023-09-20 10:06 ` [PATCH 3/4] contributor-guide: discourage marking patches as Inappropriate Roland Hieber
2023-09-20 14:19 ` [docs] " Michael Opdenacker
2023-09-21 8:53 ` Roland Hieber
2023-09-20 10:06 ` [PATCH 4/4] contributor-guide: deprecate "Accepted" patch status Roland Hieber
2023-09-20 14:25 ` Michael Opdenacker [this message]
2023-09-20 14:11 ` [docs] [PATCH 1/4] contributor-guide: recipe-style-guide: add section about CVE patches Michael Opdenacker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=12ef125b-5466-408c-ec8c-c5bef1510bc7@bootlin.com \
--to=michael.opdenacker@bootlin.com \
--cc=docs@lists.yoctoproject.org \
--cc=rhi@pengutronix.de \
--cc=yocto@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.