Dear Peter Tyser,
In message 1247241800-29059-7-git-send-email-ptyser@xes-inc.com you wrote:
Signed-off-by: Peter Tyser ptyser@xes-inc.com
Makefile | 4 ++-- {api_examples => examples/api}/.gitignore | 0 {api_examples => examples/api}/Makefile | 8 ++++---- {api_examples => examples/api}/crt0.S | 0 {api_examples => examples/api}/demo.c | 0 {api_examples => examples/api}/glue.c | 0 {api_examples => examples/api}/glue.h | 0 {api_examples => examples/api}/libgenwrap.c | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename {api_examples => examples/api}/.gitignore (100%) rename {api_examples => examples/api}/Makefile (91%) rename {api_examples => examples/api}/crt0.S (100%) rename {api_examples => examples/api}/demo.c (100%) rename {api_examples => examples/api}/glue.c (100%) rename {api_examples => examples/api}/glue.h (100%) rename {api_examples => examples/api}/libgenwrap.c (100%)
This patch doesn't apply (at least not to the current code base):
Applying: Move api_examples to examples/api error: patch failed: api_examples/Makefile:41 error: api_examples/Makefile: patch does not apply fatal: sha1 information is lacking or useless (Makefile). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001.
Please resubmit (eventually in new context).
Best regards,
Wolfgang Denk