From: Jonathan Corbet <corbet@lwn.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
"open list:DOCUMENTATION" <linux-doc@vger.kernel.org>,
"Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Subject: Re: [PULL] Documentation for 5.5
Date: Sat, 30 Nov 2019 17:14:28 -0700 [thread overview]
Message-ID: <20191130171428.6c09f892@lwn.net> (raw)
In-Reply-To: <CAHk-=whH-wrF7dx_+NgpYi8pK0vovE2mEFE3sgEYXAQZcPwBjA@mail.gmail.com>
On Sat, 30 Nov 2019 15:11:05 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> There are DOS line-endings now in some of the patches, and I noticed
> because I got a conflict in
>
> Documentation/networking/device_drivers/intel/e100.rst
>
> where your version was identical to one I had merged elsewhere, but
> had ^M at the end of the new lines.
>
> There are other examples of the same in other places.
>
> I'm not going to pull this. I have no idea what you're doing and how
> many incorrect line endings you have that just didn't happen to
> conflict.
>
> You have some *serious* tooling issues. We don't do CRLF line endings.
Hmm.
So my tooling is "git am", nothing special.
All of the afflicted files arrived in that state as the result of a pair
of patches from Jonathan (copied); I have verified that the original
patches also had the DOS line endings.
The problem repeats if I apply those patches now, even if I add an
explicit "--no-keep-cr" to the "git am" command line. It seems like maybe
my version of git is somehow broken? I have git-2.21.0-1.fc30.x86_64,
FWIW.
Anyway, if I revert the two offending patches and resend the pull, is that
good enough, or do you want this mess out of the history entirely?
Sorry for the trouble,
jon
next prev parent reply other threads:[~2019-12-01 0:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 16:30 [PULL] Documentation for 5.5 Jonathan Corbet
2019-11-30 23:11 ` Linus Torvalds
2019-12-01 0:14 ` Jonathan Corbet [this message]
2019-12-01 0:40 ` Linus Torvalds
2019-12-02 0:19 ` Jonathan Neuschäfer
2019-12-02 14:29 ` Jonathan Corbet
2019-12-02 21:05 ` pr-tracker-bot
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=20191130171428.6c09f892@lwn.net \
--to=corbet@lwn.net \
--cc=j.neuschaefer@gmx.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).