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-guidel...
Thanks,
jon