> Ah.. it looks like your mailer has mangled the patch, I'm afraid: > > $ git am -s ~/foobox/ > Applying: Fix get_node_by_path string equality check > .git/rebase-apply/patch:16: trailing whitespace. > if (p && (strlen(child->name) == p-path) && > .git/rebase-apply/patch:17: trailing whitespace. > strneq(path, child->name, p-path)) > .git/rebase-apply/patch:30: trailing whitespace. > int n1, n2, n3, n4; > .git/rebase-apply/patch:38: trailing whitespace. > /* Check reference to nested nodes with common prefix */ > .git/rebase-apply/patch:39: trailing whitespace. > n3 = fdt_path_offset(fdt, "/foo/baz"); > error: patch failed: livetree.c:478 > error: livetree.c: patch does not apply > error: patch failed: tests/path-references.c:66 > error: tests/path-references.c: patch does not apply > error: patch failed: tests/path-references.dts:12 > error: tests/path-references.dts: patch does not apply > Patch failed at 0001 Fix get_node_by_path string equality check > The copy of the patch that failed is found in: .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". > > Can you check your mailer settings. If it's not clear how to stop it > doing that, it's probably safe to attach the patch instead. Sorry about that, Outlook doesn't always behave. The patch is attached. -Tim
Attachment:
0001-Fix-get_node_by_path-string-equality-check.patch
Description: 0001-Fix-get_node_by_path-string-equality-check.patch
