X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Fsubmittingpatches.html;h=3f97c941aa59528abc90a638713fdcc2bae54e11;hb=ce74a7bb8de7f5b921d53384582de3324290cd60;hp=6ca39c48259f7c34327817e604eeb1fb377eb1c3;hpb=a40ebe73a1e0e3a4b7b5be464f1bd7952bd1c394;p=mesa.git

diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 6ca39c48259..3f97c941aa5 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -36,7 +36,7 @@
 perhaps, in very trivial cases.)
 <li>Code patches should follow Mesa
 <a href="codingstyle.html" target="_parent">coding conventions</a>.
-<li>Whenever possible, patches should only effect individual Mesa/Gallium
+<li>Whenever possible, patches should only affect individual Mesa/Gallium
 components.
 <li>Patches should never introduce build breaks and should be bisectable (see
 <code>git bisect</code>.)
@@ -120,11 +120,11 @@ them in the CC list.
 Please use common sense and do <strong>not</strong> blindly add everyone.
 <br>
 <pre>
-    $ scripts/get_reviewer.pl --help # to get the the help screen
+    $ scripts/get_reviewer.pl --help # to get the help screen
     $ scripts/get_reviewer.pl -f src/egl/drivers/dri2/platform_android.c
-    Rob Herring <robh@kernel.org> (reviewer:ANDROID EGL SUPPORT,added_lines:188/700=27%,removed_lines:58/283=20%)
-    Tomasz Figa <tfiga@chromium.org> (reviewer:ANDROID EGL SUPPORT,authored:12/41=29%,added_lines:308/700=44%,removed_lines:115/283=41%)
-    Emil Velikov <emil.l.velikov@gmail.com> (authored:13/41=32%,removed_lines:76/283=27%)
+    Rob Herring &lt;robh@kernel.org&gt; (reviewer:ANDROID EGL SUPPORT,added_lines:188/700=27%,removed_lines:58/283=20%)
+    Tomasz Figa &lt;tfiga@chromium.org&gt; (reviewer:ANDROID EGL SUPPORT,authored:12/41=29%,added_lines:308/700=44%,removed_lines:115/283=41%)
+    Emil Velikov &lt;emil.l.velikov@gmail.com&gt; (authored:13/41=32%,removed_lines:76/283=27%)
 </pre>
 </ul>
 
@@ -151,6 +151,20 @@ Whenever possible and applicable, test the patch with
 to check for regressions.
 </p>
 
+<p>
+As mentioned at the begining, patches should be bisectable.
+A good way to test this is to make use of the `git rebase` command,
+to run your tests on each commit. Assuming your branch is based off
+<code>origin/master</code>, you can run:
+</p>
+<pre>
+$ git rebase --interactive --exec "make check" origin/master
+</pre>
+<p>
+replacing <code>"make check"</code> with whatever other test you want to
+run.
+</p>
+
 
 <h2 id="mailing">Mailing Patches</h2>
 
@@ -179,6 +193,16 @@ When submitting follow-up patches you should also login to
 state of your old patches to Superseded.
 </p>
 
+<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/>
+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
+your email administrator for this.)
+</p>
+
 <h2 id="reviewing">Reviewing Patches</h2>
 
 <p>
@@ -224,7 +248,14 @@ release.
 Note: resending patch identical to one on mesa-dev@ or one that differs only
 by the extra mesa-stable@ tag is <strong>not</strong> recommended.
 </p>
+<p>
+If you are not the author of the original patch, please Cc: them in your
+nomination request.
+</p>
 
+<p>
+The current patch status can be observed in the <a href="releasing.html#stagingbranch">staging branch</a>.
+</p>
 
 <h3 id="thetag">The stable tag</h3>
 
@@ -256,6 +287,10 @@ Note: by removing the tag [as the commit is pushed] the patch is
 Thus, drop the line <strong>only</strong> if you want to cancel the nomination.
 </p>
 
+Alternatively, if one uses the "Fixes" tag as described in the "Patch formatting"
+section, it nominates a commit for all active stable branches that include the
+commit that is referred to.
+
 <h2 id="criteria">Criteria for accepting patches to the stable branch</h2>
 
 Mesa has a designated release manager for each stable branch, and the release