Skip to content

Instantly share code, notes, and snippets.

@systmkor

systmkor/swarens-patch.err

Created September 16, 2014 07:21
Show Gist options
  • Save systmkor/f9f376241060c7d0c21f to your computer and use it in GitHub Desktop.
Save systmkor/f9f376241060c7d0c21f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
swarens-patch.err
Applying: ARM: rpi_b: enable USB features in config
error: patch failed: include/configs/rpi_b.h:147
error: include/configs/rpi_b.h: patch does not apply
Patch failed at 0001 ARM: rpi_b: enable USB features in config
The copy of the patch that failed is found in:
/home/admin/u-boot/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment