From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4FE4AA09DE; Fri, 13 Nov 2020 10:43:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 441C0C868; Fri, 13 Nov 2020 10:43:44 +0100 (CET) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 782824CA6 for ; Fri, 13 Nov 2020 10:43:42 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 1E5A35C00B1; Fri, 13 Nov 2020 04:43:40 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 13 Nov 2020 04:43:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s=fm2; bh= EZN6ZujM0XEr6cBRmCmDXBTzpTyeT8MaTja+FbcJ5PA=; b=V0r2paqV2KjIRJsE 0YhxtnB+NoB3vAS2c6x9LtZHegqg7yeVUwF6/yC6OCfBmIuzXKW6jijz0nf6Q+pS sOwsAL0dDCgmM3ssN/GSmP8g2bfFomWFBXqO1IefKwDEugwCmHpg+I9Vj5piaZhh +ZCPpvdMprQmkW0yyoQdU6H3VolUXyeG7aVisq2kBGuvtThPJqWzY638nEQviL6c vJ7GF7/qSeTH43AlixHRYakvwYwRHe9SB5S1jauZwl9PdqbI/IXrnYqmYLYEEsE4 IbBSXZUvHWfflrRjmNIp98dErrVSMAZ7Sxm9PKtAe2diOAsKLHMB2FYAeWMt708/ xyM+jQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=EZN6ZujM0XEr6cBRmCmDXBTzpTyeT8MaTja+FbcJ5 PA=; b=Pu/kEcFtubfTwJaNUItYuC9fhdQqrkenBd4pgJKQ0jGi4EV6AANQREylL rdCO7ybSpwpMxkpUPy7mOm6uLFPUv0OzNPqsZ3ZpnACko5SXDMrrF61e80bWHUCS 0Bwpg4h3vuRlYoldUR9GPYQUHbNiGaLwq71p6piaACVgBoE7TnDB9Eyts9Jy01kx 4FKQCYNFG2i+RotIlSsxLPUnUO1PYpY0KHCqepdDaBNlS8FaGn8+WeuCxqzLShoT 3u7dengQl0aj4tgnLhqw3A5uydmXKLDtO7FF5+tyOJNSCfaOwOi7SI6aXHbs6k6+ xk0QptKNTwZojEac3qs0MujH1DeKQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvhedgtdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkfgjfhgggfgtsehtufertddttddvnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepudeggfdvfeduffdtfeeglefghfeukefgfffhueejtdetuedtjeeu ieeivdffgeehnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Received: from xps.localnet (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 145C93064AAF; Fri, 13 Nov 2020 04:43:38 -0500 (EST) From: Thomas Monjalon To: luca.boccassi@gmail.com, Dmitry Kozlyuk Cc: dev@dpdk.org, John Alexander , Luca Boccassi Date: Fri, 13 Nov 2020 10:43:38 +0100 Message-ID: <2419877.d5kNAccGoL@thomas> In-Reply-To: <20201113100627.569e346a@sovereign> References: <20201029225505.30093-1-dmitry.kozliuk@gmail.com> <20201112201509.1002479-1-luca.boccassi@gmail.com> <20201113100627.569e346a@sovereign> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Subject: Re: [dpdk-dev] [kmods PATCH v2] windows: normalize line-endings X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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?