From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B7A02A04FD for ; Wed, 22 Jun 2022 04:57:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B15434014F; Wed, 22 Jun 2022 04:57:28 +0200 (CEST) Received: from smtpbg511.qq.com (smtpbg511.qq.com [203.205.250.109]) by mails.dpdk.org (Postfix) with ESMTP id 9DE504014F for ; Wed, 22 Jun 2022 04:57:26 +0200 (CEST) X-QQ-mid: bizesmtp76t1655866640tnzch6fo Received: from lapjiawenwu ( [183.129.236.74]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 22 Jun 2022 10:57:19 +0800 (CST) X-QQ-SSF: 01400000000000F0P000000A0000000 X-QQ-FEAT: 3uawQE1sH+2eA3Gb8TWOjcJG4R2aCOe4UM3F1SpQoIslbgfbYioDQRTrxaaa6 i9fcQJnR4QC4QIoUuhuAROXKni5ZjnzthXGt9nk6L5A/HLSTZxkmMpvzpNKqerP3Btg3YXs snXuEHjmcn8mJHghyNcA7XHKvnO/q3uJGbb/nfVajebINderLyJzIu8vnIKYYPiThcfr1MQ Hmzd2dbwcYAL8Kl4Jvm8PUbjCFh1kdJ6jQ/I9s+oQsLS31yF8Vj7N9EkqYOOXy0izsRTVDU 792+wCTBTsqaXYX6v1etNJH1lGtFbZrqK2GOzp6tzG7eXxnrvFQLTKVcSmZgDJwWOBESR9F r8kj90xdfXE2tio03GtfAMTXKz8sdwnilvum4Ch X-QQ-GoodBg: 2 From: "Jiawen Wu" To: "'dpdk stable'" , "'Kevin Traynor'" References: <20220621100223.1148243-1-ktraynor@redhat.com> In-Reply-To: <20220621100223.1148243-1-ktraynor@redhat.com> Subject: RE: please help backporting some patches to stable release 21.11.2 Date: Wed, 22 Jun 2022 10:57:19 +0800 Message-ID: <00cb01d885e3$ca259280$5e70b780$@trustnetic.com>+F6F29C9D131A6FF8 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQIL9Ry/y/JBDqFXEX65cEzSock3XKzz3Acg Content-Language: zh-cn X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:trustnetic.com:qybgforeign:qybgforeign9 X-QQ-Bgrelay: 1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 ] > > 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@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: > 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.