History log of /linux-6.15/Documentation/process/backporting.rst (Results 1 – 5 of 5)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v6.15, v6.15-rc7, v6.15-rc6, v6.15-rc5, v6.15-rc4, v6.15-rc3, v6.15-rc2, v6.15-rc1, v6.14, v6.14-rc7, v6.14-rc6, v6.14-rc5, v6.14-rc4, v6.14-rc3, v6.14-rc2, v6.14-rc1, v6.13, v6.13-rc7, v6.13-rc6, v6.13-rc5, v6.13-rc4, v6.13-rc3, v6.13-rc2, v6.13-rc1, v6.12, v6.12-rc7
# 623e5747 07-Nov-2024 Abhinav Saxena <[email protected]>

docs: fix typos and whitespace in Documentation/process/backporting.rst

- Fix repeated word "when" in backporting documentation
- Remove trailing whitespace after '$' character

These issues were re

docs: fix typos and whitespace in Documentation/process/backporting.rst

- Fix repeated word "when" in backporting documentation
- Remove trailing whitespace after '$' character

These issues were reported by checkpatch.pl. No functional changes.

Signed-off-by: Abhinav Saxena <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

show more ...


Revision tags: v6.12-rc6, v6.12-rc5, v6.12-rc4, v6.12-rc3, v6.12-rc2
# 74f6375e 02-Oct-2024 Andrew Kreimer <[email protected]>

docs: backporting: fix a typo

Fix a typo in documentation.

Signed-off-by: Andrew Kreimer <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>
Link: https://lore.kernel.org/r/2024100

docs: backporting: fix a typo

Fix a typo in documentation.

Signed-off-by: Andrew Kreimer <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

show more ...


Revision tags: v6.12-rc1, v6.11, v6.11-rc7, v6.11-rc6
# 6e56774c 25-Aug-2024 Aryabhatta Dey <[email protected]>

docs: process: fix typos in Documentation/process/backporting.rst

Change 'submiting' to 'submitting', 'famliar' to 'familiar' and
'appared' to 'appeared'.

Signed-off-by: Aryabhatta Dey <aryabhattad

docs: process: fix typos in Documentation/process/backporting.rst

Change 'submiting' to 'submitting', 'famliar' to 'familiar' and
'appared' to 'appeared'.

Signed-off-by: Aryabhatta Dey <[email protected]>
Reviewed-by: Vegard Nossum <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>
Link: https://lore.kernel.org/r/rd2vu7z2t23ppafto4zxc6jge5mj7w7xnpmwywaa2e3eiojgf2@poicxprsdoks

show more ...


Revision tags: v6.11-rc5, v6.11-rc4, v6.11-rc3, v6.11-rc2, v6.11-rc1, v6.10, v6.10-rc7, v6.10-rc6, v6.10-rc5, v6.10-rc4, v6.10-rc3, v6.10-rc2, v6.10-rc1, v6.9, v6.9-rc7, v6.9-rc6, v6.9-rc5, v6.9-rc4, v6.9-rc3, v6.9-rc2, v6.9-rc1, v6.8, v6.8-rc7, v6.8-rc6, v6.8-rc5, v6.8-rc4, v6.8-rc3, v6.8-rc2, v6.8-rc1, v6.7, v6.7-rc8, v6.7-rc7, v6.7-rc6, v6.7-rc5, v6.7-rc4, v6.7-rc3, v6.7-rc2, v6.7-rc1, v6.6
# e7abea95 23-Oct-2023 Vegard Nossum <[email protected]>

docs: backporting: address feedback

This addresses a few comments/issues in my v2 submission:

- repeated word: 'run' from kernel test robot
- emacs/ediff mode from Jon Corbet
- various comments fro

docs: backporting: address feedback

This addresses a few comments/issues in my v2 submission:

- repeated word: 'run' from kernel test robot
- emacs/ediff mode from Jon Corbet
- various comments from Willy Tarreau
- more backporting advice from Ben Hutchings
- a couple more cherry-pick tips from Harshit Mogalapalli
- add a bit about stable submissions

Signed-off-by: Vegard Nossum <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jonathan Corbet <[email protected]>

show more ...


Revision tags: v6.6-rc7, v6.6-rc6, v6.6-rc5, v6.6-rc4, v6.6-rc3, v6.6-rc2, v6.6-rc1, v6.5
# f1477dbf 24-Aug-2023 Vegard Nossum <[email protected]>

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

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/[email protected]/
Cc: Harshit Mogalapalli <[email protected]>
Cc: Bagas Sanjaya <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Stephen Rothwell <[email protected]>
Cc: "Jason A. Donenfeld" <[email protected]>
Cc: Konstantin Ryabitsev <[email protected]>
Signed-off-by: Vegard Nossum <[email protected]>
Rule: [email protected]'or'commit
Link: https://lore.kernel.org/stable/20230824092325.1464227-1-vegard.nossum%40oracle.com
Signed-off-by: Jonathan Corbet <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

show more ...