Re: [PATCH] Fix get_node_by_path string equality check

[David Gibson <david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 1845 bytes --]

On Wed, Apr 19, 2017 at 01:15:08AM +0000, Tim Montague wrote:
>  > 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.

Thanks, applied to master.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]