From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] lpc21isp: Update to 1.85
Date: Wed, 20 Mar 2013 09:12:29 +0100 [thread overview]
Message-ID: <20130320081228.GE30288@pengutronix.de> (raw)
In-Reply-To: <5148AFC9.7000307@tomweber.eu>
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
prev parent reply other threads:[~2013-03-20 8:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-19 14:49 Thomas Weber
2013-03-19 15:28 ` Michael Olbrich
2013-03-19 15:38 ` Bernhard Walle
2013-03-19 18:34 ` Thomas Weber
2013-03-20 8:12 ` Michael Olbrich [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=20130320081228.GE30288@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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