From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 52439A0093 for ; Wed, 9 Mar 2022 13:47:17 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A60E40395; Wed, 9 Mar 2022 13:47:17 +0100 (CET) Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by mails.dpdk.org (Postfix) with ESMTP id A4A6740395 for ; Wed, 9 Mar 2022 13:47:14 +0100 (CET) Received: by mail-oo1-f50.google.com with SMTP id k13-20020a4a948d000000b003172f2f6bdfso2721345ooi.1 for ; Wed, 09 Mar 2022 04:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TFmKIESTj1y7AtbYvKALdbygL1VWSSOHFD4xSi0U4iU=; b=VsREg/pqXzZr4E2jcSrNbvIz7/xE9NbTUp2hnFpU5CWKMXo9EPJag13zw2ksCDBRGe yxiLdHOl4yE2mmkC7IjubHtESXyYUBYJfQfHd6pSeIUU1lC1hSiLDtOb7NBDC9PwxLXb fLbK4NoTwust1srJNZo3G8P/pfftMWX3ih32xDI6If/iQzw+P9sZNYfL39P272bNpf/+ 1SGvaSzh9+74QS9HO73+q7B5Wv5aEt95EY3ThSaHsqRAqlsJjFSSSpLQq8qQRn0dVO91 4lBYYSMFpzgFWslElib9Cq5JeOoowJGLAUY3duaMbcOXxNlfKPAUJkm/uhxXVuW0L7tP +Nmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TFmKIESTj1y7AtbYvKALdbygL1VWSSOHFD4xSi0U4iU=; b=V4ZXAbX1t4cTB9IMsGP7pjVLAHY06LFiJgiLtyZUEjMtTq51V7ZrCSGSyidIjxgx9C fmnySuw8eaJ9p1IR2C2cEygHzzx99dpjR+tB+oWi52wAsSofpjdFR5uhjyBYhrvfdiKh 1pjVy78v1a6MgiOwrAcrGBbCw67JOpUxgYkRAsBoFRlqVFSWVIhISujCU2H7hA6mRcHy G9j5tX95UDJUwfHxzzz148+dpLQ73KJfRafT3ajBhe+4QIJGlCFgZDIayJlw32XFeNMf 1/ENWzfviW2mB/kSxzkOjzIsfh+ffipSyyDNFcCWVCqRW31rLhXThx/cwGY0AUg1Hf1t HZmA== X-Gm-Message-State: AOAM530DuApiJs5zM7Ikzr8w2XlTmW+mNzXTtqc4vKhRgettOMtx+end 7d7z6iP+M/QhzJMwXND7wM4cUSly+Sgb0e8+DpIK8xQjIdY= X-Google-Smtp-Source: ABdhPJxpf2jotYPW+/i95ieKr/Z86bJBY+JcffpVwIAsPAMRarPvy2510COers2Dmdde1UB5wfy6HkchCK72/B3pb2U= X-Received: by 2002:a05:6870:5494:b0:da:67ee:2254 with SMTP id f20-20020a056870549400b000da67ee2254mr5167862oan.77.1646830033737; Wed, 09 Mar 2022 04:47:13 -0800 (PST) MIME-Version: 1.0 References: <20220225171532.3498996-1-christian.ehrhardt@canonical.com> In-Reply-To: From: Josh Soref Date: Wed, 9 Mar 2022 07:47:01 -0500 Message-ID: Subject: Re: please help backporting some patches to stable release 19.11.12 - part II To: Christian Ehrhardt Cc: dpdk stable Content-Type: multipart/alternative; boundary="0000000000002a9c4d05d9c87fdf" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org --0000000000002a9c4d05d9c87fdf Content-Type: text/plain; charset="UTF-8" On Wed, Mar 9, 2022, 2:49 AM Christian Ehrhardt < christian.ehrhardt@canonical.com> wrote: > On Fri, Feb 25, 2022 at 6:54 PM Josh Soref wrote: > > > > Christian Ehrhardt wrote: > > > > Hi commit authors (and maintainers), > > > > Despite being selected by the DPDK maintenance tool > ./devtools/git-log-fixes.sh > > I didn't apply following commits from DPDK main to 19.11 > > stable branch, as conflicts or build errors occur. > > > > Can authors check your patches in the following list and either: > > - Backport your patches to the 19.11 branch, or > > - Indicate that the patch should not be backported > > > > > > My spelling work can be safely skipped. > > Thank you for the FYI > > Maybe to everyone let me explain the reason why we even try :-) > In general those kinds of fixes are not "too important" but if they > can be applied it keeps the amount of extra churn lower later on. > Imagine you touch every string with a commit, afterwards nothing will > apply automatically anymore. > So sometimes backporting those changes even if they feel "not > important" can help. > Fair. Perhaps my message was a bit flippant. In general my changes are both not important and also fairly easy to backport. If you need help, I could probably allocate time to do it. I've recently grown to love Visual Studio Code's conflict handling. If my commits still have the original commit message (can't remember if they do here, probably not, but I could start from the branch that did), while rebasing I can select the word that the commit says was the replacement in the `>>>>>> spelling: ...` line, and it'll highlight the matches within the `<<<<<<` / `========` parts, and then I can visually identity which aren't in the former and copy up the fixes from the lower part. And then I click the accept link to keep the top part. > --0000000000002a9c4d05d9c87fdf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Mar 9, 2022, 2:49 AM Christian Ehrhardt <christian.ehrhardt@canoni= cal.com> wrote:
On Fri, Feb = 25, 2022 at 6:54 PM Josh Soref <jsoref@gmail.com> wrote:
>
> Christian Ehrhardt wrote:
>
> Hi commit authors (and maintainers),
>
> Despite being selected by the DPDK maintenance tool ./devtools/git-log= -fixes.sh
> I didn't apply following commits from DPDK main to 19.11
> stable branch, as conflicts or build errors occur.
>
> Can authors check your patches in the following list and either:
>=C2=A0 =C2=A0 =C2=A0- Backport your patches to the 19.11 branch, or
>=C2=A0 =C2=A0 =C2=A0- Indicate that the patch should not be backported<= br> >
>
> My spelling work can be safely skipped.

Thank you for the FYI

Maybe to everyone let me explain the reason why we even try :-)
In general those kinds of fixes are not "too important" but if th= ey
can be applied it keeps the amount of extra churn lower later on.
Imagine you touch every string with a commit, afterwards nothing will
apply automatically anymore.
So sometimes backporting those changes even if they feel "not
important" can help.
Fair. Perhaps my message was a bit flippant. In ge= neral my changes are both not important and also fairly easy to backport. I= f you need help, I could probably allocate time to do it.

I've recently grown to love Visual St= udio Code's conflict handling. If my commits still have the original co= mmit message (can't remember if they do here, probably not, but I could= start from the branch that did), while rebasing I can select the word that= the commit says was the replacement in the `>>>>>> spell= ing: ...` line, and it'll highlight the matches within the `<<<= ;<<<` / `=3D=3D=3D=3D=3D=3D=3D=3D` parts, and then I can visually = identity which aren't in the former and copy up the fixes from the lowe= r part. And then I click the accept link to keep the top part.
--0000000000002a9c4d05d9c87fdf--