diff options
| author | Vegard Nossum <vegard.nossum@oracle.com> | 2023-08-24 09:23:25 +0000 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2023-10-10 13:49:12 -0600 |
| commit | f1477dbfa5623a2738dbee77f4453f4d2519a103 (patch) | |
| tree | 5d5015d0dbb63fb9ec97a88d19a0ae6121689a4c /Documentation/process/index.rst | |
| parent | 6c5add1c61a95716459157f80d8ad89157867dfa (diff) | |
docs: add backporting and conflict resolution document
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 Mogalapalli for helping with the original blog post
as well as this updated document and Bagas Sanjaya for providing
thoughtful feedback.
v2: fixed heading style, link style, placeholder style, other comments
Link: https://lore.kernel.org/linux-doc/20230303162553.17212-1-vegard.nossum@oracle.com/
Cc: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Cc: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Rule: stable@vger.kernel.org'or'commit
Link: https://lore.kernel.org/stable/20230824092325.1464227-1-vegard.nossum%40oracle.com
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/20230824092325.1464227-1-vegard.nossum@oracle.com
Diffstat (limited to 'Documentation/process/index.rst')
| -rw-r--r-- | Documentation/process/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/process/index.rst b/Documentation/process/index.rst index db09a81d474b..a1daa309b58d 100644 --- a/Documentation/process/index.rst +++ b/Documentation/process/index.rst @@ -66,6 +66,7 @@ lack of a better place. :maxdepth: 1 applying-patches + backporting adding-syscalls magic-number volatile-considered-harmful |