http://elinux.org/index.php?title=OMAP_patch_merging_process&feed=atom&action=history 2013-05-20T13:05:52Z Revision history for this page on the wiki MediaWiki 1.21alpha http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=72151&oldid=prev 2011-10-27T21:48:01Z

<p>Add category</p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 21:48, 27 October 2011</td> </tr><tr><td colspan="2" class="diff-lineno">Line 33:</td> <td colspan="2" class="diff-lineno">Line 33:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* All patches have been posted to the relevant mailing lists for several days. For arch/arm/*omap*/* patches, you need to post to both linux-omap and linux-arm-kernel mailing lists</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* All patches have been posted to the relevant mailing lists for several days. For arch/arm/*omap*/* patches, you need to post to both linux-omap and linux-arm-kernel mailing lists</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* When your patchset is ready to be pulled, please post a pull request generated with git request-pull</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* When your patchset is ready to be pulled, please post a pull request generated with git request-pull</div></td></tr> <tr><td colspan="2">&#160;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2">&#160;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">[[Category:OMAP]]</ins></div></td></tr> <!-- diff cache key elinux:diff:version:1.11a:oldid:23869:newid:72151 --> </table>

Cschalle http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=23869&oldid=prev 2010-09-23T23:01:23Z

<p>‎<span dir="auto"><span class="autocomment">Merging patch sets using git</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 23:01, 23 September 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 30:</td> <td colspan="2" class="diff-lineno">Line 30:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch passes checkpatch.pl --strict</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch passes checkpatch.pl --strict</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch builds to avoid breaking git bisect</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch builds to avoid breaking git bisect</div></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* Each patch boots with at least the <del class="diffchange diffchange-inline">omap3_defconfig</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* Each patch boots with at least the <ins class="diffchange diffchange-inline">omap2plus_defconfig</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* All patches have been posted to the relevant mailing lists for several days. For arch/arm/*omap*/* patches, you need to post to both linux-omap and linux-arm-kernel mailing lists</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* All patches have been posted to the relevant mailing lists for several days. For arch/arm/*omap*/* patches, you need to post to both linux-omap and linux-arm-kernel mailing lists</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* When your patchset is ready to be pulled, please post a pull request generated with git request-pull</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* When your patchset is ready to be pulled, please post a pull request generated with git request-pull</div></td></tr> </table>

Tmlind http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=23863&oldid=prev 2010-09-23T23:00:52Z

<p>‎<span dir="auto"><span class="autocomment">Merging patch sets using git</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 23:00, 23 September 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 25:</td> <td colspan="2" class="diff-lineno">Line 25:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your branch is against the most recent stable kernel (or a recent -rc tag) of the mainline Linux tree. Not linux-omap master, or the PM branch.</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your branch is against the most recent stable kernel (or a recent -rc tag) of the mainline Linux tree. Not linux-omap master, or the PM branch.</div></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* <del class="diffchange diffchange-inline">If </del>there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* <ins class="diffchange diffchange-inline">Only if </ins>there are <ins class="diffchange diffchange-inline">serious </ins>merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch has a descriptive commit message, no empty patch comments please</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch has a descriptive commit message, no empty patch comments please</div></td></tr> </table>

Tmlind http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=23857&oldid=prev 2010-09-23T23:00:15Z

<p>‎<span dir="auto"><span class="autocomment">Merging patch sets using git</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 23:00, 23 September 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 24:</td> <td colspan="2" class="diff-lineno">Line 24:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>If you provide a git branch, please use the following checklist:</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>If you provide a git branch, please use the following checklist:</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* Your branch is against the most recent stable kernel<del class="diffchange diffchange-inline">, </del>or a recent -rc tag<del class="diffchange diffchange-inline">, </del>of the mainline Linux tree<del class="diffchange diffchange-inline">, not </del>linux-omap master, or the PM branch</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* Your branch is against the most recent stable kernel <ins class="diffchange diffchange-inline">(</ins>or a recent -rc tag<ins class="diffchange diffchange-inline">) </ins>of the mainline Linux tree<ins class="diffchange diffchange-inline">. Not </ins>linux-omap master, or the PM branch<ins class="diffchange diffchange-inline">.</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td></tr> </table>

Tmlind http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=23851&oldid=prev 2010-09-23T22:59:31Z

<p>‎<span dir="auto"><span class="autocomment">Merging patch sets using git</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 22:59, 23 September 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 24:</td> <td colspan="2" class="diff-lineno">Line 24:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>If you provide a git branch, please use the following checklist:</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>If you provide a git branch, please use the following checklist:</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* Your branch is against the most stable kernel or recent -rc tag of the mainline Linux tree, not linux-omap master, or the PM branch</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* Your branch is against the most <ins class="diffchange diffchange-inline">recent </ins>stable kernel<ins class="diffchange diffchange-inline">, </ins>or <ins class="diffchange diffchange-inline">a </ins>recent -rc tag<ins class="diffchange diffchange-inline">, </ins>of the mainline Linux tree, not linux-omap master, or the PM branch</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td></tr> </table>

Tmlind http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=23845&oldid=prev 2010-09-23T22:33:10Z

<p>‎<span dir="auto"><span class="autocomment">Merging patch sets using git</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 22:33, 23 September 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 24:</td> <td colspan="2" class="diff-lineno">Line 24:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>If you provide a git branch, please use the following checklist:</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>If you provide a git branch, please use the following checklist:</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* Your branch is against the <del class="diffchange diffchange-inline">current </del>mainline Linux tree, not linux-omap master, or the PM branch</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* Your branch is against the <ins class="diffchange diffchange-inline">most stable kernel or recent -rc tag of the </ins>mainline Linux tree, not linux-omap master, or the PM branch</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td></tr> </table>

Tmlind http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=23419&oldid=prev 2010-09-16T19:22:56Z

<p>‎<span dir="auto"><span class="autocomment">Patch submission checklist</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 19:22, 16 September 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 12:</td> <td colspan="2" class="diff-lineno">Line 12:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Make sure all patches compile (this is needed for git bisect to work)</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Make sure all patches compile (this is needed for git bisect to work)</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Make sure other omaps don't break and keep compiling</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Make sure other omaps don't break and keep compiling</div></td></tr> <tr><td colspan="2">&#160;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">* Make sure you don't break other people's work</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Send driver code to the right subsystem maintainer in MAINTAINERS file</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Send driver code to the right subsystem maintainer in MAINTAINERS file</div></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* Cc linux-omap@vger.kernel.org list for all the patches</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* Cc linux-omap@vger.kernel.org list for all the <ins class="diffchange diffchange-inline">omap related </ins>patches</div></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* Send arch/arm/*omap*/ <del class="diffchange diffchange-inline">in separate </del>patches</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* Send arch/arm/*omap*/ patches <ins class="diffchange diffchange-inline">separately when possible</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Send what can be sent as fixes during the -rc cycle</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Send what can be sent as fixes during the -rc cycle</div></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* Prepare code for the next merge window early, the deadline for new code is -<del class="diffchange diffchange-inline">rc7</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* Prepare code for the next merge window early, the deadline for new code is -<ins class="diffchange diffchange-inline">rc6</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>= Merging patch sets using git =</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>= Merging patch sets using git =</div></td></tr> </table>

Tmlind http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=23413&oldid=prev 2010-09-16T19:20:41Z

<p>‎<span dir="auto"><span class="autocomment">Merging patch sets using git</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 19:20, 16 September 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 26:</td> <td colspan="2" class="diff-lineno">Line 26:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>* Each patch has a descriptive commit message</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>* Each patch has a descriptive commit message<ins class="diffchange diffchange-inline">, no empty patch comments please</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch passes checkpatch.pl --strict</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch passes checkpatch.pl --strict</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch builds to avoid breaking git bisect</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch builds to avoid breaking git bisect</div></td></tr> </table>

Tmlind http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=21002&oldid=prev 2010-05-14T17:51:19Z

<p>‎<span dir="auto"><span class="autocomment">Merging patchsets using git</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 17:51, 14 May 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 18:</td> <td colspan="2" class="diff-lineno">Line 18:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Prepare code for the next merge window early, the deadline for new code is -rc7</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Prepare code for the next merge window early, the deadline for new code is -rc7</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>−</td><td style="background: #ffa; color:black; font-size: smaller;"><div>= Merging <del class="diffchange diffchange-inline">patchsets </del>using git =</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>= Merging <ins class="diffchange diffchange-inline">patch sets </ins>using git =</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>If you have several patches, the preferred way of merging them is to provide a git branch to pull from.</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>If you have several patches, the preferred way of merging them is to provide a git branch to pull from.</div></td></tr> </table>

Tmlind http://elinux.org/index.php?title=OMAP_patch_merging_process&diff=21001&oldid=prev 2010-05-14T17:44:54Z

<p>‎<span dir="auto"><span class="autocomment">Merging patchsets using git</span></span></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black;">← Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 17:44, 14 May 2010</td> </tr><tr><td colspan="2" class="diff-lineno">Line 26:</td> <td colspan="2" class="diff-lineno">Line 26:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* If there are merge conflicts, you may need to rebase on the current omap-for-linus branch in the linux-omap tree</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Your git is configured so the committer and author show up correctly</div></td></tr> <tr><td colspan="2">&#160;</td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">* Each patch has a descriptive commit message</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch passes checkpatch.pl --strict</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch passes checkpatch.pl --strict</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch builds to avoid breaking git bisect</div></td><td class='diff-marker'>&#160;</td><td style="background: #eee; color:black; font-size: smaller;"><div>* Each patch builds to avoid breaking git bisect</div></td></tr> <!-- diff cache key elinux:diff:version:1.11a:oldid:21000:newid:21001 --> </table>

Tmlind