From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathias Nyman Subject: Re: [PATCH v3 iproute2] ip: Add color output option Date: Tue, 28 Apr 2015 13:09:56 +0300 Message-ID: <20150428100956.GA25279@iki.fi> References: <20150424113451.GA8133@iki.fi> <20150427163704.65d53140@urahara> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, aleksi.aalto@iki.fi To: Stephen Hemminger Return-path: Received: from mail.kapsi.fi ([217.30.184.167]:56947 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933028AbbD1KKA (ORCPT ); Tue, 28 Apr 2015 06:10:00 -0400 Content-Disposition: inline In-Reply-To: <20150427163704.65d53140@urahara> Sender: netdev-owner@vger.kernel.org List-ID: 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).