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 26E54A09DE; Fri, 13 Nov 2020 10:52:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BEF59C868; Fri, 13 Nov 2020 10:52:48 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id F2BE64CA6 for ; Fri, 13 Nov 2020 10:52:46 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id c9so7531739wml.5 for ; Fri, 13 Nov 2020 01:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=9epUY9k3X4hO1/uE976FCYoBtcnIVQIQhQ19jWdzllk=; b=vDGaIGbiotdUMRwS9AlDZSkNMGtOup+VXaJAsYBGNfG9d0nfZaG7gVaxwbUKueXdFj k1S/drajKnDQ1/vJCoA47Cjb8aiGb89FEIZQI3hbZ+vlsa8p/AijabqdX6uIKOFbd/KT 5qprb+lMw+ShnipOZkSA1B+EFEsil1wk4WHF/CZTeyByR5VqviAQyDoh8C8EWf2LuX6D rcxBL08xB70m5yUk6LnSFi1TGZpeEtQsTVr90XWuLNOJY5VY6u2UXZmJaK8Z69RauB10 LfyGLCNgafYXbdzD8u7A3urVW0X9avSVF0oehpqNpQxhANxh1Nzh6jT9Hqz3rtkY13q5 8GlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=9epUY9k3X4hO1/uE976FCYoBtcnIVQIQhQ19jWdzllk=; b=WJF7iImgCZTiLVp2V1voBMVzCyWo2JDQxm5kpg5yG8Nvob0P2lBhNiGKsC0mxE5aX4 auAco7NdZShNalljlBKW2uyrrfFcMuUlhYJDMGAs+AMZ1eq2bs6c5z4+NkOc1+NRYk3R n24+Ji36y4n0CYuXfLrxYIBBfAmQQiEaf6fKtJnqDt7P0Nnwpx52Sak/lYyGX5ANSSej PsVkT8ZMGy58asojSIqBN7AqWyCGLmbZuFPdVznSKbPuM6Auqcp0Tzjt6r4tjGJackVp SQY5oXqmFsgitSkDQLlETNLpROYX3u8G4NUHFDOR+8P6L/nk7Q8SXilaEMqj2w3wXDaN rcIQ== X-Gm-Message-State: AOAM531HfOQpPZQQLwIa5ZcfSGQ8LkBpHJ260fUzKA/lysCyzaQB2gfd X87lSbpOpkHXWUWf8dXrskY= X-Google-Smtp-Source: ABdhPJw+Bdx3r51TFBKJNHdBsrv5wcuXzCo6mwuzmM5ilzS52qc7aLw+DtLzrSPQHHlGUNTVZlFhlA== X-Received: by 2002:a1c:ac03:: with SMTP id v3mr1696464wme.9.1605261166762; Fri, 13 Nov 2020 01:52:46 -0800 (PST) Received: from bluca-lenovo ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w186sm9753717wmb.26.2020.11.13.01.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 01:52:45 -0800 (PST) Message-ID: From: Luca Boccassi To: Thomas Monjalon , Dmitry Kozlyuk Cc: dev@dpdk.org, John Alexander Date: Fri, 13 Nov 2020 09:52:45 +0000 In-Reply-To: <2419877.d5kNAccGoL@thomas> References: <20201029225505.30093-1-dmitry.kozliuk@gmail.com> <20201112201509.1002479-1-luca.boccassi@gmail.com> <20201113100627.569e346a@sovereign> <2419877.d5kNAccGoL@thomas> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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" 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