Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git am --whitespace=fix ~/sserial_updates.patch
- Applying: Add support for second user register in Smart Serial, and improve the handling of errors.
- /tmp/emc2-dev/.git/rebase-apply/patch:18: trailing whitespace.
- digital I/O pin. By default all Module instances with the exception of
- /tmp/emc2-dev/.git/rebase-apply/patch:19: trailing whitespace.
- SmartSerial are enabled, and all the board's pins are used by the Module
- /tmp/emc2-dev/.git/rebase-apply/patch:47: trailing whitespace.
- port pins, three parameters and a further 7 pins shared between all ports used
- /tmp/emc2-dev/.git/rebase-apply/patch:65: trailing whitespace.
- (u32, ro) .error-count: Indicates the state of the Smart Serial error handler,
- /tmp/emc2-dev/.git/rebase-apply/patch:66: trailing whitespace.
- see the parameters sections for more details.
- error: patch failed: src/hal/drivers/mesa-hostmot2/hostmot2.h:516
- error: src/hal/drivers/mesa-hostmot2/hostmot2.h: patch does not apply
- error: src/hal/drivers/mesa-hostmot2/mesa_other_sserial.c: does not exist in index
- Patch failed at 0001 Add support for second user register in Smart Serial, and improve the handling of errors.
- 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".
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement