please help backporting some patches to stable release 21.11.2

Kevin Traynor ktraynor at redhat.com
Fri Jun 24 16:17:11 CEST 2022


Hi Niklas,

On 22/06/2022 11:48, Niklas Söderlund wrote:
> Hi Kevin,
> 
> Thanks for your backporting efforts.
> 
> On 2022-06-21 11:02:23 +0100, Kevin Traynor wrote:
>> 417be15e5f  Peng Zhang       net/nfp: make sure MTU is never larger than mbuf size
> 
> This patch was submitted [1] with a 'Depends-on' on tag, on patch [2]
> that is now upstream as,
> 
>      commit 733afb244d304839 ("net/nfp: update how max MTU is read")
> 
> We have verified that the commits cherry-picked in order to the backport
> branch applies as-is. Unfortunately we have a fix in dpdk-next-net for
> the fix (with a Fixes tag) that needs to be considered.
> 
>      commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz")
> 
> In summary for this backport the following upstream commits needs to be
> backported (all or none), in order:
> 
>      commit 733afb244d304839 ("net/nfp: update how max MTU is read")
>      commit 417be15e5f1117c3 ("net/nfp: make sure MTU is never larger than mbuf size")
>      from dpdk-next-net:

Adding the updated commit details in case we are trying to remember what 
we did in the future:

>      commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz")
This commit ^ merged in dpdk main branch as:

commit 5c305e218f15552d828e10293d19d9a06c4747f4
Author: Peng Zhang <peng.zhang at corigine.com>
Date:   Wed Jun 15 12:14:17 2022 +0200

     net/nfp: fix initialization


> 
> My question is how would you prefer I handle this? Shall I create a
> backport patch with all of them squashed, create a backport series with
> the patches and send it out, or would you prefer to cherry-pick the
> commits yourself, or something else?
> 
> I'm sorry for this messy backport.
> 

No problems, thanks for the detailed explanation. I've queued all three 
patches in that order on my 21.11 branch [0]. I will push to the 
dpdk.org 21.11 branch with the next batch of backports in the coming days.

thanks,
Kevin.

[0]
fe2cddeb08 net/nfp: update how max MTU is read
1c770fda6f net/nfp: make sure MTU is never larger than mbuf size
bf7aa26ddd net/nfp: fix initialization

> 1. https://patchwork.dpdk.org/project/dpdk/patch/20220511011553.2905582-1-peng.zhang@corigine.com/
> 2. https://patchwork.dpdk.org/project/dpdk/patch/20220420134638.24010-1-walter.heymans@corigine.com/
> 



More information about the stable mailing list