From: Jonathan Corbet <corbet@lwn.net>
To: Vegard Nossum <vegard.nossum@oracle.com>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, backports@vger.kernel.org,
Vegard Nossum <vegard.nossum@oracle.com>,
Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
"Jason A . Donenfeld" <Jason@zx2c4.com>
Subject: Re: [PATCH] docs: add backporting and conflict resolution document
Date: Tue, 14 Mar 2023 12:43:21 -0600 [thread overview]
Message-ID: <875yb3rx6e.fsf@meer.lwn.net> (raw)
In-Reply-To: <20230303162553.17212-1-vegard.nossum@oracle.com>
Vegard Nossum <vegard.nossum@oracle.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@oracle.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Jason A. Donenfeld <Jason@zx2c4.com>
> Signed-off-by: Vegard Nossum <vegard.nossum@oracle.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
--
To unsubscribe from this list: send the line "unsubscribe backports" in
prev parent reply other threads:[~2023-03-14 18:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 16:25 [PATCH] docs: add backporting and conflict resolution document Vegard Nossum
2023-03-05 4:03 ` Bagas Sanjaya
2023-03-07 11:43 ` Vegard Nossum
2023-03-08 8:10 ` Vegard Nossum
2023-03-11 2:42 ` Bagas Sanjaya
2023-03-14 18:43 ` Jonathan Corbet [this message]
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=875yb3rx6e.fsf@meer.lwn.net \
--to=corbet@lwn.net \
--cc=Jason@zx2c4.com \
--cc=backports@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=harshit.m.mogalapalli@oracle.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stable@vger.kernel.org \
--cc=vegard.nossum@oracle.com \
/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 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 read-only IMAP folder(s) and NNTP newsgroup(s).