From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from 81-89-104-214.blue.kundencontroller.de ([81.89.104.214]
	helo=tomweber.eu) by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <thomas@tomweber.eu>) id 1UI1NY-0003bw-DP
	for ptxdist@pengutronix.de; Tue, 19 Mar 2013 19:35:22 +0100
Message-ID: <5148AFC9.7000307@tomweber.eu>
Date: Tue, 19 Mar 2013 19:34:49 +0100
From: Thomas Weber <thomas@tomweber.eu>
MIME-Version: 1.0
References: <1363704576-18984-1-git-send-email-thomas.weber@corscience.de>
	<20130319152833.GB30288@pengutronix.de>
	<20130319153825.GA3716@regiomontanus.your-server.de>
In-Reply-To: <20130319153825.GA3716@regiomontanus.your-server.de>
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
Cc: Bernhard Walle <bernhard@bwalle.de>, thomas.weber@corscience.de

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.

Thomas

-- 
ptxdist mailing list
ptxdist@pengutronix.de