From: Kevin Traynor <ktraynor@redhat.com>
To: "Niklas Söderlund" <niklas.soderlund@corigine.com>
Cc: dpdk stable <stable@dpdk.org>, peng.zhang@corigine.com
Subject: Re: please help backporting some patches to stable release 21.11.2
Date: Fri, 24 Jun 2022 15:17:11 +0100 [thread overview]
Message-ID: <03c7227d-94cb-0335-02a1-807dc0599594@redhat.com> (raw)
In-Reply-To: <YrLzdTzN1LI6twX7@oden.dyn.berto.se>
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@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/
>
next prev parent reply other threads:[~2022-06-24 14:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 10:02 Kevin Traynor
2022-06-22 2:57 ` Jiawen Wu
2022-06-22 4:26 ` Gagandeep Singh
2022-06-23 14:08 ` Kevin Traynor
2022-06-22 4:47 ` Zhou, YidingX
2022-06-22 8:40 ` Kalesh Anakkur Purayil
2022-06-22 10:48 ` Niklas Söderlund
2022-06-24 14:17 ` Kevin Traynor [this message]
[not found] ` <62b2851c.1c69fb81.cf480.7398SMTPIN_ADDED_BROKEN@mx.google.com>
2022-06-23 14:05 ` Kevin Traynor
-- strict thread matches above, loose matches on Subject: below --
2022-06-24 16:31 Kevin Traynor
2022-06-27 9:15 ` Stanisław Kardach
2022-06-28 14:14 ` Kevin Traynor
2022-06-27 13:39 ` Rahul Lakkireddy
2022-06-28 14:18 ` Kevin Traynor
2022-06-27 21:15 ` McDaniel, Timothy
2022-06-28 14:13 ` Kevin Traynor
2022-06-28 14:20 ` Kevin Traynor
2022-06-29 10:24 ` Niklas Söderlund
2022-07-01 16:06 ` Kevin Traynor
2022-07-06 20:40 ` luca.boccassi
2022-08-01 13:31 ` McDaniel, Timothy
2022-05-10 13:00 Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=03c7227d-94cb-0335-02a1-807dc0599594@redhat.com \
--to=ktraynor@redhat.com \
--cc=niklas.soderlund@corigine.com \
--cc=peng.zhang@corigine.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).