From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>
Subject: Re: [PATCH] tools: Fix recevied/received typos
Date: Fri, 29 Jul 2016 09:42:03 -0700 (PDT) [thread overview]
Message-ID: <alpine.OSX.2.20.1607290931410.62393@mjmartin-mac01.local> (raw)
In-Reply-To: <CABBYNZ+_rMYB_mRhC2+wxytv=O=K3BNcK05yZooGrAQA=4ZpEA@mail.gmail.com>
On Fri, 29 Jul 2016, Luiz Augusto von Dentz wrote:
> Doesn't apply:
>
> Applying: tools: Fix recevied/received typos
> error: patch failed: tools/ubcsp.c:351
> error: tools/ubcsp.c: patch does not apply
> Patch failed at 0002 tools: Fix recevied/received typos
That's a surprise. Turns out it's an issue with the CRLF line endings in
ubcsp.c, and there's nothing to be done about it on the git format-patch /
git send-email side.
Please use 'git am --keep-cr' to apply the patch.
Maybe converting ubscp.{h,c} to Unix line endings is worth it after all.
What do you think?
--
Mat Martineau
Intel OTC
prev parent reply other threads:[~2016-07-29 16:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-28 16:21 [PATCH] tools: Fix recevied/received typos Mat Martineau
2016-07-29 11:11 ` Luiz Augusto von Dentz
2016-07-29 16:42 ` Mat Martineau [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=alpine.OSX.2.20.1607290931410.62393@mjmartin-mac01.local \
--to=mathew.j.martineau@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
/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