Backporting
Backporting to Stable Branches is the shortest demo. Although it doesn't use kernel trees as examples, the concept is very applicable to kernel maintenance.
For conflict resolution see Backporting and conflict resolution. Depending on how the targeted tree is maintained there could be different ways to do it. One possible way is finding all the dependent patches by recursively git-blaming the partent commit of the incoming commit, like what the kernel doc mentioned.
This however might not work if commits in the targeted tree somehow deviates from the upstream too much. Good luck maintaining one then!
References
Videos
- Backporting Linux Kernel patches
- Shung-Hsi Yu: Backporting BPF: Techniques and Challenges
- Backporting to Stable Branches
- Michal Kubeček: Backporting horror stories
- LAS16-101: Efficient kernel Backporting
- Contributing to the CentOS Stream Kernel - Prarit Bhargava and Don Zickus