[PATCH] doc/develop/sending_patches.rst: Clarify when to use which branch

[Heinrich Schuchardt]

On 8/26/24 18:39, Tom Rini wrote:
> The previous wording on the paragraph about what branch to use when
> submitting patches did not reflect how / when the next branch is
> currently used. Reword this to note that master should be used for bug
> and regression fixes, always, and that next should be used once it
> opens, with -rc2.
>
> Reported-by: Jerome Forissier <jerome.forissier at linaro.org>
> Signed-off-by: Tom Rini <trini at konsulko.com>

Hello Tom,

I missed that patch in my recent documentation pull-request.

Maybe you just want to add it to master with whatever comes next.

Reviewed-by: Heinrich Schuchardt <xypron.glpk at gmx.de>

> ---
>   doc/develop/sending_patches.rst | 12 +++++++-----
>   1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/doc/develop/sending_patches.rst b/doc/develop/sending_patches.rst
> index 3f25b1d0466f..82efb717b179 100644
> --- a/doc/develop/sending_patches.rst
> +++ b/doc/develop/sending_patches.rst
> @@ -74,11 +74,13 @@ General Patch Submission Rules
>
>   * Send your patches as plain text messages: no HTML, no MIME, no links, no
>     compression, no attachments. Just plain text. The best way the generate
> -  patches is by using the ``git format-patch`` command. Please use the
> -  ``master`` branch of the mainline U-Boot git repository
> -  (``https://source.denx.de/u-boot/u-boot.git``) as reference, unless (usually
> -  late in a release cycle) there has been an announcement to use the ``next``
> -  branch of this repository instead.
> +  patches is by using the ``git format-patch`` command. For a patch that is
> +  fixing a bug or regression of some sort, please use the ``master`` branch of
> +  the mainline U-Boot git repository
> +  (``https://source.denx.de/u-boot/u-boot.git``) as reference. For new
> +  features, if the ``next`` branch has been opened (which happens with the
> +  release of ``-rc2``) that branch should be used, otherwise ``master`` is
> +  acceptable.
>
>   * Make sure that your mailer does not mangle the patch by automatic changes
>     like wrapping of longer lines etc.