github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 01:29:07 +00:00
Code Issues Projects Releases Wiki Activity

docs: Update kernel patches doc

Browse Source 
It's useful for cherry-picked patches to know which tree
they got patched from. Include a "Origin:" line.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-03-30 10:46:49 +01:00
parent 730e11757c
commit eaef1ca8fb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/kernel-patches.md
View File

@ -72,12 +72,12 @@ Again, resolve any conflicts as described above.
# Adding/Removing patches # Adding/Removing patches
If you want to add or remove patches make sure you have an up-to-date branch with the currently applied patches (see above). Then either any normal means (`git cherry-pick -x`, `git am`, or `git commit`, etc) to add new patches. If you want to add or remove patches make sure you have an up-to-date branch with the currently applied patches (see above). Then either any normal means (`git cherry-pick -x`, `git am`, or `git commit`, etc) to add new patches. For cherry-picked patches also please add a `Origin:` line after the DCO lines with a reference the git tree the patch was cherry-picked from.
If the patch is not cherry-picked from a standard Linux tree (like If the patch is not cherry-picked try to include as much information
newer stable branches, `linux-next`, `net-next`, Linus' tree) try to in the commit message as possible as to where the patch originated
include as much information in the commit message as possible as to from. The canonical form would be to add a `Origin:` line after the
where the patch originated from. The canonical form would be to add a `Origin:` line after the DCO lines, e.g.: DCO lines, e.g.:
``` ```
Origin: https://patchwork.ozlabs.org/patch/622404/ Origin: https://patchwork.ozlabs.org/patch/622404/
``` ```