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 7C32AA0552 for ; Mon, 27 Jun 2022 15:40:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 568F240685; Mon, 27 Jun 2022 15:40:15 +0200 (CEST) Received: from stargate.chelsio.com (stargate.chelsio.com [12.32.117.8]) by mails.dpdk.org (Postfix) with ESMTP id D006640685 for ; Mon, 27 Jun 2022 15:40:13 +0200 (CEST) Received: from localhost (venkateshellapu.asicdesigners.com [10.193.177.158] (may be forged)) by stargate.chelsio.com (8.14.7/8.14.7) with ESMTP id 25RDdtLL031151; Mon, 27 Jun 2022 06:39:56 -0700 Date: Mon, 27 Jun 2022 19:09:54 +0530 From: Rahul Lakkireddy To: dpdk stable Cc: Andrew Rybchenko , Anoob Joseph , Arek Kusztal , Bruce Richardson , Chaoyong He , Chengwen Feng , Conor Walsh , Dariusz Sosnowski , David Marchand , Daxue Gao , Fan Zhang , Harman Kalra , Jasvinder Singh , Jerin Jacob , Li Zhang , Louis Peens , Matan Azrad , Maxime Coquelin , Morten =?iso-8859-1?Q?Br=F8rup?= , Niklas =?iso-8859-1?Q?S=F6derlund?= , Nithin Dabilpuram , Pavan Nikhilesh , Peng Zhang , Stanislaw Kardach , Stephen Hemminger , Sunil Kumar Kori , Timothy McDaniel , Viacheslav Ovsiienko , Walter Heymans , Yajun Wu , Luca Boccassi Subject: Re: please help backporting some patches to stable release 21.11.2 Message-ID: References: <20220624163108.1884382-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220624163108.1884382-1-ktraynor@redhat.com> 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 On Friday, June 06/24/22, 2022 at 17:31:08 +0100, Kevin Traynor 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 21.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 21.11 branch, or > - Indicate that the patch should not be backported > > Please do either of the above by 07/01/22. > > You can find the a temporary work-in-progress branch of the coming 21.11.2 > release at: > https://github.com/kevintraynor/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 ] > > 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 21.11] foo/bar: fix baz > > With git format-patch, this can be achieved by appending the parameter: > --subject-prefix='PATCH 21.11' > > Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org". > > FYI, branch 21.11 is located at tree: > https://git.dpdk.org/dpdk-stable > > Thanks. > > Kevin > > --- > These commits have non-trivial conflicts while applying to 21.11 branch: > 4c1a91b21f Arek Kusztal crypto/qat: fix cleanup function default behaviour > 5b4d317d83 Arek Kusztal crypto/qat: fix missing copy guards in asym mod > d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment > a31c9f970d David Marchand net/cnxk: fix crash in IPsec telemetry > 6cef22dcfe Harman Kalra net/cnxk: fix PFC class disabling > 6f065d1539 Li Zhang vdpa/mlx5: fix maximum number of virtqs > b2c5ff1bd9 Nithin Dabilpuram common/cnxk: fix mbox structs to avoid unaligned access > 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device > e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe path > 2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport mode > 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size > 694c75e8e3 Rahul Lakkireddy test/crypto: fix build with optimization=1 Please skip this commit. Looks like its dependent commit: d02c6bfcb99a ("test/crypto: add ESN and antireplay cases") is not available in DPDK v21.11. It seems to be available from DPDK v22.03, instead. > c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC > f75dd6d3b1 Stanislaw Kardach config: fix C++ cross compiler for Arm and PPC > 174f2f3512 Sunil Kumar Kori common/cnxk: add PFC support for VF > 95af59b7ad Yajun Wu vdpa/mlx5: workaround VAR offset within page > > These commits apply cleanly to 21.11 branch but cause build errors: > aa802b1023 Bruce Richardson dma/idxd: fix AVX2 in non-datapath functions > (^ commit causes build error on OBS CentOS7. No need to rework, can take > when fix arives on DPDK main) > > 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device > 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get > 45a192b2b4 Stephen Hemminger sched: fix floating point math > 87ecdd9e7f Timothy McDaniel event/dlb2: improve enqueue efficiency > Thanks, Rahul