From: Luca Boccassi <luca.boccassi@gmail.com>
To: Thomas Monjalon <thomas@monjalon.net>,
Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Cc: dev@dpdk.org, John Alexander <John.Alexander@datapath.co.uk>
Subject: Re: [dpdk-dev] [kmods PATCH v2] windows: normalize line-endings
Date: Fri, 13 Nov 2020 09:52:45 +0000 [thread overview]
Message-ID: <e5187c0ae4df9dd2fbb32441afae591a8841705c.camel@gmail.com> (raw)
In-Reply-To: <2419877.d5kNAccGoL@thomas>
On Fri, 2020-11-13 at 10:43 +0100, Thomas Monjalon wrote:
> 13/11/2020 08:06, Dmitry Kozlyuk:
> > Hi Luca,
> >
> > Thank you for taking the initiative. However, the patch fails to apply on my
> > system, and that's the reason I've been delaying my own):
> >
> > $ git am \[kmods\ PATCH\ v2\]\ windows:\ normalize\ line-endings
> > Applying: windows: normalize line-endings
> > error: windows/virt2phys/virt2phys.sln: does not match index
> > error: windows/virt2phys/virt2phys.vcxproj: does not match index
> > error: patch failed: windows/virt2phys/virt2phys.vcxproj.filters:1
> > error: windows/virt2phys/virt2phys.vcxproj.filters: patch does not apply
> > Patch failed at 0001 windows: normalize line-endings
> >
> > As far as I understand, this is caused by removed BOM: it exists in the repo,
> > so it is included in the patch, but it's absent from checked-out files, so the
> > patch fails to apply. Either there is some git option we're missing or only
> > committer (i.e. Thomas) can do the conversion. It is correct to remove BOM.
> > Note that \No newline at end of file will be restored by Visual Studio on
> > save.
>
> What is BOM?
Last try: I split the patch, and first the gitattributes file is
removed. I believe that's what stops the patch from being applicable.
Also removed the bit in the README.
Thomas, I think if v3 is still not enough and there's still a dos2unix
diff, then it means we can't do this change via patches, but it has to
be done directly on your repo and pushed.
--
Kind regards,
Luca Boccassi
next prev parent reply other threads:[~2020-11-13 9:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 22:55 [dpdk-dev] [kmods PATCH] " Dmitry Kozlyuk
2020-11-03 4:05 ` Narcisa Ana Maria Vasile
2020-11-03 7:42 ` Dmitry Kozlyuk
2020-11-03 10:05 ` Luca Boccassi
2020-11-11 15:02 ` Luca Boccassi
2020-11-11 15:11 ` Dmitry Kozlyuk
2020-11-03 20:49 ` Narcisa Ana Maria Vasile
2020-11-11 15:02 ` Thomas Monjalon
2020-11-11 15:03 ` Luca Boccassi
2020-11-11 15:09 ` Luca Boccassi
2020-11-12 20:16 ` Luca Boccassi
2020-11-12 20:15 ` [dpdk-dev] [kmods PATCH v2] " luca.boccassi
2020-11-12 23:17 ` Thomas Monjalon
2020-11-13 7:06 ` Dmitry Kozlyuk
2020-11-13 9:43 ` Thomas Monjalon
2020-11-13 9:52 ` Luca Boccassi [this message]
2020-11-13 9:50 ` [dpdk-dev] [kmods PATCH v3 1/2] windows: remove .gitattributes luca.boccassi
2020-11-13 9:50 ` [dpdk-dev] [kmods PATCH v3 2/2] windows: normalize line-endings luca.boccassi
2020-11-13 15:12 ` Thomas Monjalon
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=e5187c0ae4df9dd2fbb32441afae591a8841705c.camel@gmail.com \
--to=luca.boccassi@gmail.com \
--cc=John.Alexander@datapath.co.uk \
--cc=dev@dpdk.org \
--cc=dmitry.kozliuk@gmail.com \
--cc=thomas@monjalon.net \
/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).