linux-kernel - Re: [PATCH] docs: add backporting and conflict resolution document

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <875yb3rx6e.fsf@meer.lwn.net>
Date:   Tue, 14 Mar 2023 12:43:21 -0600
From:   Jonathan Corbet <corbet@....net>
To:     Vegard Nossum <vegard.nossum@...cle.com>
Cc:     linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org,
        stable@...r.kernel.org, backports@...r.kernel.org,
        Vegard Nossum <vegard.nossum@...cle.com>,
        Harshit Mogalapalli <harshit.m.mogalapalli@...cle.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        "Jason A . Donenfeld" <Jason@...c4.com>
Subject: Re: [PATCH] docs: add backporting and conflict resolution document

Vegard Nossum <vegard.nossum@...cle.com> writes:

> This is a new document based on my 2022 blog post:
>
>   https://blogs.oracle.com/linux/post/backporting-patches-using-git
>
> Although this is aimed at stable contributors and distro maintainers, it
> does also contain useful tips and tricks for anybody who needs to
> resolve merge conflicts.
>
> By adding this to the kernel as documentation we can more easily point
> to it e.g. from stable emails about failed backports, as well as allow
> the community to modify it over time if necessary.
>
> I've added this under process/ since it also has
> process/applying-patches.rst. Another interesting document is
> maintainer/rebasing-and-merging.rst which maybe should eventually refer
> to this one, but I'm leaving that as a future cleanup.
>
> Thanks to Harshit for helping with the original blog post as well as
> this updated document.
>
> Cc: Harshit Mogalapalli <harshit.m.mogalapalli@...cle.com>
> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Cc: Stephen Rothwell <sfr@...b.auug.org.au>
> Cc: Jason A. Donenfeld <Jason@...c4.com>
> Signed-off-by: Vegard Nossum <vegard.nossum@...cle.com>
> ---
>  Documentation/process/backporting.rst | 488 ++++++++++++++++++++++++++
>  Documentation/process/index.rst       |   1 +
>  2 files changed, 489 insertions(+)
>  create mode 100644 Documentation/process/backporting.rst

So I'm not seeing a lot of discussion here; I guess it's almost perfect
:)  I would request, though, that you send me a version that conforms to
our conventions for heading markup, as described in

  Documentation/doc-guide/sphinx.rst
  https://www.kernel.org/doc/html/latest/doc-guide/sphinx.html#specific-guidelines-for-the-kernel-documentation

Thanks,

jon