please help backporting some patches to stable release 21.11.2
Gagandeep Singh
G.Singh at nxp.com
Wed Jun 22 06:26:48 CEST 2022
Hi Kevin,
Please skip patch "13ce268103 Gagandeep Singh common/dpaax: remove dead code" from backporting.
Regards,
Gagan
> -----Original Message-----
> From: Kevin Traynor <ktraynor at redhat.com>
> Sent: Tuesday, June 21, 2022 3:32 PM
> To: dpdk stable <stable at dpdk.org>
> Cc: Ajit Khaparde <ajit.khaparde at broadcom.com>; Andrew Rybchenko
> <andrew.rybchenko at oktetlabs.ru>; Chaoyong He
> <chaoyong.he at corigine.com>; Chengwen Feng <fengchengwen at huawei.com>;
> Dariusz Sosnowski <dsosnowski at nvidia.com>; Gagandeep Singh
> <G.Singh at nxp.com>; Jerin Jacob <jerinj at marvell.com>; Jiawen Wu
> <jiawenwu at trustnetic.com>; Kalesh AP <kalesh-
> anakkur.purayil at broadcom.com>; Louis Peens <louis.peens at corigine.com>;
> Morten Brørup <mb at smartsharesystems.com>; Niklas Söderlund
> <niklas.soderlund at corigine.com>; Nithin Dabilpuram
> <ndabilpuram at marvell.com>; Pavan Nikhilesh <pbhagavatula at marvell.com>;
> Peng Zhang <peng.zhang at corigine.com>; Qi Zhang <qi.z.zhang at intel.com>;
> Somnath Kotur <somnath.kotur at broadcom.com>; Viacheslav Ovsiienko
> <viacheslavo at nvidia.com>; Walter Heymans <walter.heymans at corigine.com>;
> Yiding Zhou <yidingx.zhou at intel.com>
> Subject: please help backporting some patches to stable release 21.11.2
>
> 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 06/23/22.
>
> You can find the a temporary work-in-progress branch of the coming 21.11.2
> release at:
>
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.co
> m%2Fkevintraynor%2Fdpdk-
> stable&data=05%7C01%7Cg.singh%40nxp.com%7Cdec326eb24504b126b1
> 108da536d2f23%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63791
> 4025688667641%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQ
> IjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sd
> ata=PVn61hm46cv7e0A3N2ZT1XnwnoYvAufCq0vqpwkBDMk%3D&reserved
> =0
> 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://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.dpdk.
> org%2Fdpdk-
> stable%2Fcommit%2F%3Fh%3D18.11%26id%3Dd90e6ae6f936ecdc2fd3811ff9f2
> 6aec7f3c06eb&data=05%7C01%7Cg.singh%40nxp.com%7Cdec326eb24504
> b126b1108da536d2f23%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7
> C637914025688667641%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwM
> DAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C
> &sdata=v6naGPkpVuZCHIxHSPADMFWbY%2FCy9p7q08VkqbcaXTM%3D&a
> mp;reserved=0
>
> 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 at dpdk.org" but not "dev at dpdk.org".
>
> FYI, branch 21.11 is located at tree:
>
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.dpdk.
> org%2Fdpdk-
> stable&data=05%7C01%7Cg.singh%40nxp.com%7Cdec326eb24504b126b1
> 108da536d2f23%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63791
> 4025688667641%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQ
> IjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sd
> ata=SoqOVS3dIRZ9iePy5FRjr%2BDhCg3%2BfSjbekn81ADCLbI%3D&reserved
> =0
>
> Thanks.
>
> Kevin
>
> ---
> These commits have non-trivial conflicts while applying to 21.11 branch:
> d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment
> 13ce268103 Gagandeep Singh common/dpaax: remove dead code
> 708ebe7d03 Jiawen Wu net/ngbe: fix external PHY power down
> 6dcfb19f60 Jiawen Wu net/ngbe: fix reading M88E1512 PHY mode
> 696a821178 Jiawen Wu net/ngbe: redesign internal PHY init flow
> 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
>
> These commits apply cleanly to 21.11 branch but cause build errors:
> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
> c0278f6e52 Kalesh AP net/bnxt: fix tunnel stateless offloads
> 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get
> 676d986b4b Yiding Zhou net/iavf: fix crash after VF reset failure
More information about the stable
mailing list