please help backporting some patches to stable release 21.11.2

Niklas Söderlund niklas.soderlund at corigine.com
Wed Jun 22 12:48:21 CEST 2022


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:
    commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz")

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.

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/

-- 
Kind Regards,
Niklas Söderlund


More information about the stable mailing list