<html><body><div style="color:#000; background-color:#fff; font-family:arial, helvetica, sans-serif;font-size:10pt"><div style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><span>Hello,</span></div><div style="font-family: arial, helvetica, sans-serif; font-size: 13px; color: rgb(0, 0, 0); background-color: transparent; font-style: normal;"><span><br></span></div><div style="background-color: transparent;"><span><font size="2">Sorry about that. I'm moving a bit fast now, covering multiple BSPs, and committing those changes simultaneously. Due to this I needed to rebase in order to modify previous commits related to csb336(changing # if defined() to #if ) . During this process, something weird happened with my branch. It showed some unmerged content. And I was not able to correct this, even after searching Google. As a last option I made a new branch from the version of my local repository, which seemed alright to
me.</font></span></div><div style="background-color: transparent; color: rgb(0, 0, 0); font-size: 13px; font-family: arial, helvetica, sans-serif; font-style: normal;"><span><font size="2"><br></font></span></div><div style="background-color: transparent; color: rgb(0, 0, 0); font-size: 13px; font-family: arial, helvetica, sans-serif; font-style: normal;"><span><font size="2">Hopefully now, my workflow should not face any hurdle, and so do my patches :-)</font></span></div><div style="font-family: arial, helvetica, clean, sans-serif; font-size: 13px; color: rgb(0, 0, 0); background-color: transparent; font-style: normal;"><br></div><div style="font-family: arial, helvetica, clean, sans-serif; font-size: 13px; color: rgb(0, 0, 0); background-color: transparent; font-style: normal;">Regards</div><div style="font-family: arial, helvetica, clean, sans-serif; font-size: 13px; color: rgb(0, 0, 0); background-color: transparent; font-style: normal;"><span
style="background-color:transparent;line-height:1.22;">Vipul Nayyar </span></div><div style="font-family: arial, helvetica, clean, sans-serif; font-size: 12.727272033691406px; color: rgb(0, 0, 0); background-color: transparent; font-style: normal;"><br></div><div style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"><br></div> <div style="font-family: arial, helvetica, sans-serif; font-size: 10pt;"> <div style="font-family: 'times new roman', 'new york', times, serif; font-size: 12pt;"> <div dir="ltr"> <hr size="1"> <font size="2" face="Arial"> <b><span style="font-weight:bold;">From:</span></b> Sebastian Huber <sebastian.huber@embedded-brains.de><br> <b><span style="font-weight: bold;">To:</span></b> rtems-devel@rtems.org <br> <b><span style="font-weight: bold;">Sent:</span></b> Wednesday, 10 July 2013 1:42 PM<br> <b><span style="font-weight: bold;">Subject:</span></b> Re: [PATCH] Updated Legacy code in arm csb336<br> </font>
</div> <div class="y_msg_container"><br>Hello,<br><br>how did you generate and send this patch? I had to deal with this:<br><br>git am --reject \[PATCH\]\ Updated\ Legacy\ code\ in\ arm\ csb336.eml<br>Applying: Updated Legacy code in arm csb336<br>Checking patch c/src/lib/libbsp/arm/csb336/console/uart.c...<br>error: while searching for:<br><br>}<br><br>#if defined(USE_INTERRUPTS)<br>static ssize_t imx_uart_intr_write(int minor, const char *buf, size_t len)<br>{<br> imx_uart_data[minor].buf = buf;<br><br>error: patch failed: c/src/lib/libbsp/arm/csb336/console/uart.c:291<br>Hunk #9 succeeded at 327 (offset 2 lines).<br>Hunk #10 succeeded at 371 (offset 2 lines).<br>Hunk #11 succeeded at 441 (offset 2 lines).<br>Hunk #12 succeeded at 449 (offset 2 lines).<br>Hunk #13 succeeded at 457 (offset 2 lines).<br>Hunk #14 succeeded at 467 (offset 2 lines).<br>Checking patch c/src/lib/libbsp/arm/csb336/network/network.c...<br>Applying patch
c/src/lib/libbsp/arm/csb336/console/uart.c with 1 rejects...<br>Hunk #1 applied cleanly.<br>Hunk #2 applied cleanly.<br>Hunk #3 applied cleanly.<br>Hunk #4 applied cleanly.<br>Hunk #5 applied cleanly.<br>Hunk #6 applied cleanly.<br>Hunk #7 applied cleanly.<br>Rejected hunk #8.<br>Hunk #9 applied cleanly.<br>Hunk #10 applied cleanly.<br>Hunk #11 applied cleanly.<br>Hunk #12 applied cleanly.<br>Hunk #13 applied cleanly.<br>Hunk #14 applied cleanly.<br>Applied patch c/src/lib/libbsp/arm/csb336/network/network.c cleanly.<br>Patch failed at 0001 Updated Legacy code in arm csb336<br>When you have resolved this problem run "git am --resolved".<br>If you would prefer to skip this patch, instead run "git am --skip".<br>To restore the original branch and stop patching run "git am --abort".<br><br>I had to manually clean this up:<br><br><a href="http://git.rtems.org/rtems/commit/?id=52e44630e57b030d22dc6866425929efb1abac0f"
target="_blank">http://git.rtems.org/rtems/commit/?id=52e44630e57b030d22dc6866425929efb1abac0f</a><br><br>-- <br>Sebastian Huber, embedded brains GmbH<br><br>Address : Dornierstr. 4, D-82178 Puchheim, Germany<br>Phone : +49 89 189 47 41-16<br>Fax : +49 89 189 47 41-09<br>E-Mail : <a ymailto="mailto:sebastian.huber@embedded-brains.de" href="mailto:sebastian.huber@embedded-brains.de">sebastian.huber@embedded-brains.de</a><br>PGP : Public key available on request.<br><br>Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.<br>_______________________________________________<br>rtems-devel mailing list<br><a ymailto="mailto:rtems-devel@rtems.org" href="mailto:rtems-devel@rtems.org">rtems-devel@rtems.org</a><br><a href="http://www.rtems.org/mailman/listinfo/rtems-devel" target="_blank">http://www.rtems.org/mailman/listinfo/rtems-devel</a><br><br></div> </div> </div> </div></body></html>