From: Mathias Nyman <m.nyman@iki•fi>
To: Stephen Hemminger <stephen@networkplumber•org>
Cc: netdev@vger•kernel.org, aleksi.aalto@iki•fi
Subject: Re: [PATCH v3 iproute2] ip: Add color output option
Date: Tue, 28 Apr 2015 13:09:56 +0300 [thread overview]
Message-ID: <20150428100956.GA25279@iki.fi> (raw)
In-Reply-To: <20150427163704.65d53140@urahara>
On 2015-04-27 16:37-0700, Stephen Hemminger wrote:
> Patch does not apply cleanly to current version in git.
> All patches should be based off of
>
> http://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
>
> I suspect your mailer is corrupting whitespace.
> Maybe easier to send patch as an attachment.
>
> $ patch -p1 < ~/Downloads/v3-iproute2-ip-Add-color-output-option.patch
> patching file include/color.h
> patching file ip/ip.c
> Hunk #1 FAILED at 23.
> Hunk #2 FAILED at 56.
> Hunk #3 FAILED at 257.
> 3 out of 3 hunks FAILED -- saving rejects to file ip/ip.c.rej
> patching file ip/ipaddress.c
> Hunk #1 FAILED at 34.
> Hunk #2 FAILED at 136.
> Hunk #3 FAILED at 606.
> Hunk #4 FAILED at 666.
> Hunk #5 FAILED at 849.
> 5 out of 5 hunks FAILED -- saving rejects to file ip/ipaddress.c.rej
> patching file lib/Makefile
> Hunk #1 FAILED at 7.
> 1 out of 1 hunk FAILED -- saving rejects to file lib/Makefile.rej
> patching file lib/color.c
> patching file man/man8/ip.8
> Hunk #1 FAILED at 33.
> Hunk #2 FAILED at 165.
> 2 out of 2 hunks FAILED -- saving rejects to file man/man8/ip.8.rej
>
My email client (mutt) was adding leading spaces. Sorry for the
hassle. Sending new patch set (v4).
prev parent reply other threads:[~2015-04-28 10:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-24 11:34 [PATCH v3 iproute2] ip: Add color output option Mathias Nyman
2015-04-27 23:37 ` Stephen Hemminger
2015-04-28 10:09 ` Mathias Nyman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150428100956.GA25279@iki.fi \
--to=m.nyman@iki$(echo .)fi \
--cc=aleksi.aalto@iki$(echo .)fi \
--cc=netdev@vger$(echo .)kernel.org \
--cc=stephen@networkplumber$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox