Re: please help backporting some patches to stable release 20.11.5

[Luca Boccassi <luca.boccassi@gmail.com>]

On Tue, 8 Mar 2022 at 17:44, De Lara Guarch, Pablo
<pablo.de.lara.guarch@intel.com> wrote:
>
> Hi Luca,
>
> > -----Original Message-----
> > From: luca.boccassi@gmail.com <luca.boccassi@gmail.com>
> > Sent: Monday, February 28, 2022 9:32 PM
> > Cc: Akhil Goyal <akhil.goyal@nxp.com>; Chengwen Feng
> > <fengchengwen@huawei.com>; Zhang, Roy Fan <roy.fan.zhang@intel.com>;
> > Laatz, Kevin <kevin.laatz@intel.com>; Khoa To <khot@microsoft.com>; Matan
> > Azrad <matan@nvidia.com>; Michael Baum <michaelba@nvidia.com>; De Lara
> > Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Shahaf Shuler
> > <shahafs@nvidia.com>; Tal Shnaiderman <talshn@nvidia.com>; Viacheslav
> > Ovsiienko <viacheslavo@nvidia.com>; Yongseok Koh <yskoh@mellanox.com>
> > Subject: please help backporting some patches to stable release 20.11.5
> >
> > 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 20.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 20.11 branch, or
> >     - Indicate that the patch should not be backported
> >
> > Please do either of the above by 03/07/22.
> >
> > You can find the a temporary work-in-progress branch of the coming 20.11.5
> > release at:
> >     https://github.com/bluca/dpdk-stable
> > It is recommended to backport on top of that to minimize further conflicts or
> > misunderstandings.
> >
> > Some notes on stable backports:
> >
> > A backport should contain a reference to the DPDK main branch commit in it's
> > commit message in the following fashion:
> >     [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
> >
> > For example:
> >     https://git.dpdk.org/dpdk-
> > stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
> >
> > When sending the backported patch, please indicate the target branch in the
> > subject line, as we have multiple branches, for example:
> >     [PATCH 20.11] foo/bar: fix baz
> >
> > With git format-patch, this can be achieved by appending the parameter:
> >     --subject-prefix='PATCH 20.11'
> >
> > Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org".
> >
> > FYI, branch 20.11 is located at tree:
> >    https://git.dpdk.org/dpdk-stable
> >
> > Thanks.
> >
> > Luca Boccassi
> >
> > ---
> > 033904450b  Chengwen Feng    dma/hisilicon: use common PCI device naming
> > 6be4c57add  Michael Baum     net/mlx5: fix errno update in shared context
> > creation
> > dcbaafdc8f  Michael Baum     net/mlx5: fix sibling device config check
> > a501609ea6  Pablo de Lara    crypto/ipsec_mb: fix length and offset settings
>
> Apologies, but looks like the commit "crypto/ipsec_mb: fix length and offset settings"
> Has introduced a bug which I am fixing now. I will send a fix to the dev list soon,
> but I am wondering if it's better to combine it into a single one and push it to the stable list instead of backporting two commits?

Hi,

Please send the fix separately, so that we can better track the main
branch version. If the fix doesn't get into 22.03, we can postpone
both backports until the next stable release, to avoid introducing
regressions.

Kind regards,
Luca Boccassi