diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-07-07 10:34:14 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-07-07 10:34:14 +0800 |
commit | 65c0e55c16d87ab094ae512d1dc1c481be27bf21 (patch) | |
tree | 01b89607be540d3dbc3a1b2bdd20ccdd8e30eff7 /Documentation | |
parent | 80f04edd1db9e64fc5310130b9b2c95b965ec9c9 (diff) | |
parent | ff694e286c5044cbb740856e8b86836256824be8 (diff) |
Merge tag 'v3.14.11' into linux-linaro-lsk-v3.14
This is the 3.14.11 stable release
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/SubmittingPatches | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 26b1e31d5a13..1ec219a14904 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -119,6 +119,20 @@ Example: platform_set_drvdata(), but left the variable "dev" unused, delete it. +If your patch fixes a bug in a specific commit, e.g. you found an issue using +git-bisect, please use the 'Fixes:' tag with the first 12 characters of the +SHA-1 ID, and the one line summary. +Example: + + Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()") + +The following git-config settings can be used to add a pretty format for +outputting the above style in the git log or git show commands + + [core] + abbrev = 12 + [pretty] + fixes = Fixes: %h (\"%s\") 3) Separate your changes. @@ -430,7 +444,7 @@ person it names. This tag documents that potentially interested parties have been included in the discussion -14) Using Reported-by:, Tested-by:, Reviewed-by: and Suggested-by: +14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes: If this patch fixes a problem reported by somebody else, consider adding a Reported-by: tag to credit the reporter for their contribution. Please @@ -485,6 +499,12 @@ idea was not posted in a public forum. That said, if we diligently credit our idea reporters, they will, hopefully, be inspired to help us again in the future. +A Fixes: tag indicates that the patch fixes an issue in a previous commit. It +is used to make it easy to determine where a bug originated, which can help +review a bug fix. This tag also assists the stable kernel team in determining +which stable kernel versions should receive your fix. This is the preferred +method for indicating a bug fixed by the patch. See #2 above for more details. + 15) The canonical patch format |