Hi Xueming, On Thu, Jun 16, 2022 at 7:18 PM Xueming Li 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 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 06/30/22. > > You can find the a temporary work-in-progress branch of the coming 20.11.6 > release at: > https://github.com/steevenlee/dpdk > 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 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. > > Xueming Li > > --- > > c0278f6e52 Kalesh AP net/bnxt: fix tunnel stateless offloads > > I have backported the above upstream commit and sent it to the list. I had to make some extra changes to fix build failure. Regards, Kalesh -- Regards, Kalesh A P