diff options
Diffstat (limited to 'docs/submittingpatches.html')
| -rw-r--r-- | docs/submittingpatches.html | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html index 48cc6768b46..81fa4cddea7 100644 --- a/docs/submittingpatches.html +++ b/docs/submittingpatches.html @@ -118,9 +118,9 @@ patch has already been reviewed. <li>In order for your patch to reach the prospective reviewer easier/faster, use the script scripts/get_reviewer.pl to get a list of individuals and include them in the CC list. -<br> +<p> Please use common sense and do <strong>not</strong> blindly add everyone. -<br> +</p> <pre> $ scripts/get_reviewer.pl --help # to get the help screen $ scripts/get_reviewer.pl -f src/egl/drivers/dri2/platform_android.c @@ -207,7 +207,9 @@ state of your old patches to Superseded. <p> Some companies' mail server automatically append a legal disclaimer, usually containing something along the lines of "The information in this -email is confidential" and "distribution is strictly prohibited".<br/> +email is confidential" and "distribution is strictly prohibited". +</p> +<p> These legal notices prevent us from being able to accept your patch, rendering the whole process pointless. Please make sure these are disabled before sending your patches. (Note that you may need to contact @@ -382,7 +384,6 @@ won't have any negative effect on the patch nomination. <p> Note: by removing the tag [as the commit is pushed] the patch is <strong>explicitly</strong> rejected from inclusion in the stable branch(es). -<br> Thus, drop the line <strong>only</strong> if you want to cancel the nomination. </p> @@ -448,14 +449,18 @@ be lost from the stable branch if developers push things directly. Consider yourself warned. <h2 id="backports">Sending backports for the stable branch</h2> +<p> 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 <code>Conflicts</code> section. Summary of which will be provided in the <a href="releasing.html#prerelease">pre-release</a> announcement. -<br> +</p> + +<p> Developers are interested in sending backports are recommended to use either a <code>[BACKPORT #branch]</code> subject prefix or provides similar information within the commit summary. +</p> <h2 id="gittips">Git tips</h2> |