From: Kevin Traynor <ktraynor@redhat.com>
To: dpdk stable <stable@dpdk.org>
Cc: "Ajit Khaparde" <ajit.khaparde@broadcom.com>,
"Andrew Rybchenko" <andrew.rybchenko@oktetlabs.ru>,
"Chaoyong He" <chaoyong.he@corigine.com>,
"Chengwen Feng" <fengchengwen@huawei.com>,
"Dariusz Sosnowski" <dsosnowski@nvidia.com>,
"Gagandeep Singh" <g.singh@nxp.com>,
"Jerin Jacob" <jerinj@marvell.com>,
"Jiawen Wu" <jiawenwu@trustnetic.com>,
"Kalesh AP" <kalesh-anakkur.purayil@broadcom.com>,
"Louis Peens" <louis.peens@corigine.com>,
"Morten Brørup" <mb@smartsharesystems.com>,
"Niklas Söderlund" <niklas.soderlund@corigine.com>,
"Nithin Dabilpuram" <ndabilpuram@marvell.com>,
"Pavan Nikhilesh" <pbhagavatula@marvell.com>,
"Peng Zhang" <peng.zhang@corigine.com>,
"Qi Zhang" <qi.z.zhang@intel.com>,
"Somnath Kotur" <somnath.kotur@broadcom.com>,
"Viacheslav Ovsiienko" <viacheslavo@nvidia.com>,
"Walter Heymans" <walter.heymans@corigine.com>,
"Yiding Zhou" <yidingx.zhou@intel.com>
Subject: please help backporting some patches to stable release 21.11.2
Date: Tue, 21 Jun 2022 11:02:23 +0100 [thread overview]
Message-ID: <20220621100223.1148243-1-ktraynor@redhat.com> (raw)
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=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
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@dpdk.org" but not "dev@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:
d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment
13ce268103 Gagandeep Singh common/dpaax: remove dead code
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
e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe path
2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport mode
417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size
These commits apply cleanly to 21.11 branch but cause build errors:
14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device
c0278f6e52 Kalesh AP net/bnxt: fix tunnel stateless offloads
485df8847a Chengwen Feng ethdev: clarify null location case in xstats get
676d986b4b Yiding Zhou net/iavf: fix crash after VF reset failure
next reply other threads:[~2022-06-21 10:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 10:02 Kevin Traynor [this message]
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
[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=20220621100223.1148243-1-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=ajit.khaparde@broadcom.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=chaoyong.he@corigine.com \
--cc=dsosnowski@nvidia.com \
--cc=fengchengwen@huawei.com \
--cc=g.singh@nxp.com \
--cc=jerinj@marvell.com \
--cc=jiawenwu@trustnetic.com \
--cc=kalesh-anakkur.purayil@broadcom.com \
--cc=louis.peens@corigine.com \
--cc=mb@smartsharesystems.com \
--cc=ndabilpuram@marvell.com \
--cc=niklas.soderlund@corigine.com \
--cc=pbhagavatula@marvell.com \
--cc=peng.zhang@corigine.com \
--cc=qi.z.zhang@intel.com \
--cc=somnath.kotur@broadcom.com \
--cc=stable@dpdk.org \
--cc=viacheslavo@nvidia.com \
--cc=walter.heymans@corigine.com \
--cc=yidingx.zhou@intel.com \
/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).