From eaef1ca8fbf4285561e8a36e585d78638926fe33 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 30 Mar 2017 10:46:49 +0100 Subject: [PATCH] docs: Update kernel patches doc It's useful for cherry-picked patches to know which tree they got patched from. Include a "Origin:" line. Signed-off-by: Rolf Neugebauer --- docs/kernel-patches.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/kernel-patches.md b/docs/kernel-patches.md index 1b4b14a3c..cbdb96276 100644 --- a/docs/kernel-patches.md +++ b/docs/kernel-patches.md @@ -72,12 +72,12 @@ Again, resolve any conflicts as described above. # 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 -newer stable branches, `linux-next`, `net-next`, Linus' tree) try to -include as much information in the commit message as possible as to -where the patch originated from. The canonical form would be to add a `Origin:` line after the DCO lines, e.g.: +If the patch is not cherry-picked try to include as much information +in the commit message as possible as to where the patch originated +from. The canonical form would be to add a `Origin:` line after the +DCO lines, e.g.: ``` Origin: https://patchwork.ozlabs.org/patch/622404/ ```