summaryrefslogtreecommitdiff
path: root/doc/develop/sending_patches.rst
diff options
context:
space:
mode:
Diffstat (limited to 'doc/develop/sending_patches.rst')
-rw-r--r--doc/develop/sending_patches.rst14
1 files changed, 8 insertions, 6 deletions
diff --git a/doc/develop/sending_patches.rst b/doc/develop/sending_patches.rst
index 3f25b1d0466..9308f428bbd 100644
--- a/doc/develop/sending_patches.rst
+++ b/doc/develop/sending_patches.rst
@@ -73,12 +73,14 @@ General Patch Submission Rules
cover letter why they are ignored is desired.
* Send your patches as plain text messages: no HTML, no MIME, no links, no
- compression, no attachments. Just plain text. The best way the generate
- patches is by using the ``git format-patch`` command. Please use the
- ``master`` branch of the mainline U-Boot git repository
- (``https://source.denx.de/u-boot/u-boot.git``) as reference, unless (usually
- late in a release cycle) there has been an announcement to use the ``next``
- branch of this repository instead.
+ compression, no attachments. Just plain text. The best way to generate
+ patches is by using the ``git format-patch`` command. For a patch that is
+ fixing a bug or regression of some sort, please use the ``master`` branch of
+ the mainline U-Boot git repository
+ (``https://source.denx.de/u-boot/u-boot.git``) as reference. For new
+ features, if the ``next`` branch has been opened (which happens with the
+ release of ``-rc2``) that branch should be used, otherwise ``master`` is
+ acceptable.
* Make sure that your mailer does not mangle the patch by automatic changes
like wrapping of longer lines etc.