Advertisement
Guest User

Untitled

a guest
Aug 13th, 2011
263
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.32 KB | None | 0 0
  1. $ git am --whitespace=fix ~/sserial_updates.patch
  2. Applying: Add support for second user register in Smart Serial, and improve the handling of errors.
  3. /tmp/emc2-dev/.git/rebase-apply/patch:18: trailing whitespace.
  4. digital I/O pin. By default all Module instances with the exception of
  5. /tmp/emc2-dev/.git/rebase-apply/patch:19: trailing whitespace.
  6. SmartSerial are enabled, and all the board's pins are used by the Module
  7. /tmp/emc2-dev/.git/rebase-apply/patch:47: trailing whitespace.
  8. port pins, three parameters and a further 7 pins shared between all ports used
  9. /tmp/emc2-dev/.git/rebase-apply/patch:65: trailing whitespace.
  10. (u32, ro) .error-count: Indicates the state of the Smart Serial error handler,
  11. /tmp/emc2-dev/.git/rebase-apply/patch:66: trailing whitespace.
  12. see the parameters sections for more details.
  13. error: patch failed: src/hal/drivers/mesa-hostmot2/hostmot2.h:516
  14. error: src/hal/drivers/mesa-hostmot2/hostmot2.h: patch does not apply
  15. error: src/hal/drivers/mesa-hostmot2/mesa_other_sserial.c: does not exist in index
  16. Patch failed at 0001 Add support for second user register in Smart Serial, and improve the handling of errors.
  17. When you have resolved this problem run "git am --resolved".
  18. If you would prefer to skip this patch, instead run "git am --skip".
  19. To restore the original branch and stop patching run "git am --abort".
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement