[PATCH] Updated Legacy code in arm csb336
nayyar_vipul at yahoo.com
Wed Jul 10 08:31:46 UTC 2013
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.
Hopefully now, my workflow should not face any hurdle, and so do my patches :-)
From: Sebastian Huber <sebastian.huber at embedded-brains.de>
To: rtems-devel at rtems.org
Sent: Wednesday, 10 July 2013 1:42 PM
Subject: Re: [PATCH] Updated Legacy code in arm csb336
how did you generate and send this patch? I had to deal with this:
git am --reject \[PATCH\]\ Updated\ Legacy\ code\ in\ arm\ csb336.eml
Applying: Updated Legacy code in arm csb336
Checking patch c/src/lib/libbsp/arm/csb336/console/uart.c...
error: while searching for:
static ssize_t imx_uart_intr_write(int minor, const char *buf, size_t len)
imx_uart_data[minor].buf = buf;
error: patch failed: c/src/lib/libbsp/arm/csb336/console/uart.c:291
Hunk #9 succeeded at 327 (offset 2 lines).
Hunk #10 succeeded at 371 (offset 2 lines).
Hunk #11 succeeded at 441 (offset 2 lines).
Hunk #12 succeeded at 449 (offset 2 lines).
Hunk #13 succeeded at 457 (offset 2 lines).
Hunk #14 succeeded at 467 (offset 2 lines).
Checking patch c/src/lib/libbsp/arm/csb336/network/network.c...
Applying patch c/src/lib/libbsp/arm/csb336/console/uart.c with 1 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Rejected hunk #8.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Applied patch c/src/lib/libbsp/arm/csb336/network/network.c cleanly.
Patch failed at 0001 Updated Legacy code in arm csb336
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
I had to manually clean this up:
Sebastian Huber, embedded brains GmbH
Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail : sebastian.huber at embedded-brains.de
PGP : Public key available on request.
Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
rtems-devel mailing list
rtems-devel at rtems.org
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the devel