please help backporting some patches to stable release 21.11.2
Jiawen Wu
jiawenwu at trustnetic.com
Wed Jun 22 04:57:19 CEST 2022
On Tuesday, June 21, 2022 6:02 PM, 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 06/23/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 <commit's dpdk main branch SHA-1 checksum> ]
>
> For example:
>
> https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3
> 811ff9f26aec7f3c06eb
>
> 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://git.dpdk.org/dpdk-stable
>
> Thanks.
>
> Kevin
>
> ---
> These commits have non-trivial conflicts while applying to 21.11 branch:
> 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
Hi Kevin,
There is no need to backport these to 21.11.2.
More information about the stable
mailing list