Re: [U-Boot] [PATCH v2] Print program basename instead of whole path in usage()

Dear Horst Kronstorfer,

In message 1324469157-18032-1-git-send-email-hkronsto@frequentis.com you wrote:

Signed-off-by: Horst Kronstorfer hkronsto@frequentis.com

Changes for v2:

• Use the GNU version of basename().
• Rebased against branch 'next.'

tools/mkenvimage.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)

This does not apply cleanly against current master:

Applying: Print program basename instead of whole path in usage() Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging tools/mkenvimage.c CONFLICT (content): Merge conflict in tools/mkenvimage.c Failed to merge in the changes. Patch failed at 0001 Print program basename instead of whole path in usage()

Best regards,

Wolfgang Denk