diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index ef5be716d93..69835af6ebb 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -25,6 +25,7 @@
Reviewing Patches
Nominating a commit for a stable branch
Criteria for accepting patches to the stable branch
+Sending backports for the stable branch
Git tips
@@ -287,9 +288,9 @@ that have been nominated.
Patch must be a bug fix and not a new feature.
Note: An exception to this rule, are hardware-enabling "features". For
- example, backports of new code to support a newly-developed hardware product
- can be accepted if they can be reasonably determined not to have effects on
- other hardware.
+ example, backports of new code to support a
+ newly-developed hardware product can be accepted if they can be reasonably
+ determined not to have effects on other hardware.
Patch must be reviewed, For example, the commit message has Reviewed-by,
Signed-off-by, or Tested-by tags from someone but the author.
@@ -313,6 +314,16 @@ identified as causing a regression). These force-pushes may cause changes to
be lost from the stable branch if developers push things directly. Consider
yourself warned.
+Sending backports for the stable branch
+By default merge conflicts are resolved by the stable-release manager. In which
+case he/she should provide a comment about the changes required, alongside the
+Conflicts section. Summary of which will be provided in the
+pre-release announcement.
+
+Developers are interested in sending backports are recommended to use either a
+[BACKPORT #branch] subject prefix or provides similar information
+within the commit summary.
+
Git tips