From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10]
	ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1UIE8N-0003ID-2W
	for ptxdist@pengutronix.de; Wed, 20 Mar 2013 09:12:31 +0100
Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1UIE8L-0004IN-0a
	for ptxdist@pengutronix.de; Wed, 20 Mar 2013 09:12:29 +0100
Date: Wed, 20 Mar 2013 09:12:29 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20130320081228.GE30288@pengutronix.de>
References: <1363704576-18984-1-git-send-email-thomas.weber@corscience.de>
	<20130319152833.GB30288@pengutronix.de>
	<20130319153825.GA3716@regiomontanus.your-server.de>
	<5148AFC9.7000307@tomweber.eu>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <5148AFC9.7000307@tomweber.eu>
Subject: Re: [ptxdist] [PATCH] lpc21isp: Update to 1.85
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

On Tue, Mar 19, 2013 at 07:34:49PM +0100, Thomas Weber wrote:
> Hello Michael,
> 
> On 03/19/2013 04:38 PM, Bernhard Walle wrote:
> > Hi,
> >
> > * Michael Olbrich <m.olbrich@pengutronix.de> [2013-03-19 16:28]:
> >> On Tue, Mar 19, 2013 at 03:49:36PM +0100, Thomas Weber wrote:
> >>> The patch for building lpc21isp on ARM Linux
> >>> is included in the sources.
> >> This fails to apply here.
> > I remember strange line endings in the patch. Thomas has to send the
> > patch as attached gzip file.
> >
> > http://www.mail-archive.com/ptxdist@pengutronix.de/msg04539.html
> >
> > Or he finds the git options I didn't find last year. :)
> >
> 
> can you try
> 
> git am --ignore-whitespace <patch>
> 
> I tried something with --keep-cr and crlf in the repo, but this seems to
> be the best option.

That works. And we're just removing the patch so it whitespaces don't
matter. Thanks, applied.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de