From: Ken Dreyer Date: Tue, 5 May 2015 17:25:46 +0000 (-0600) Subject: SubmittingPatches: clarify backport procedure X-Git-Tag: v9.0.2~242^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9282f15d058b8dd3aa8e7b92e6ea0431d4c2c2a4;p=ceph.git SubmittingPatches: clarify backport procedure Developers should not add "Backport: " fields to Git commits, because this data is immutable after the commits are merged. It makes more sense to handle this information in Redmine instead. Signed-off-by: Ken Dreyer --- diff --git a/SubmittingPatches b/SubmittingPatches index 130f97756c9d..ef87df620a39 100644 --- a/SubmittingPatches +++ b/SubmittingPatches @@ -266,11 +266,12 @@ A: The target branch depends on the nature of your change: If you are fixing a bug (see above) *and* the bug exists in older stable branches (for example, the "dumpling" or "firefly" branches), then you - should add a "Backport: " line to your commit message. This will - notify other developers that your commit should be cherry-picked to these - stable branches. For example, you should add "Backport: firefly" to - indicate that you are fixing a bug that exists on the "firefly" branch and - that you desire that your change be cherry-picked to that branch. + should file a Redmine ticket describing your issue and fill out the + "Backport: " form field. This will notify other developers that + your commit should be cherry-picked to these stable branches. For example, + you should set "Backport: firefly" in your Redmine ticket to indicate that + you are fixing a bug that exists on the "firefly" branch and that you + desire that your change be cherry-picked to that branch. 2) Patch submission via ceph-devel@vger.kernel.org