<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
I am using the master-net-mlx branch as base to verify.</div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
And cross-checked the main and master-net-mlx branch diverage now. </div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Patch 1 was good and patch 2 failed to apply on the main branch.</div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div class="elementToProof"><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">[rongweil@gen-l-vrt-290 mlnx_dpdk]$ patch -d ./ -p 1 < 1.patch</span></div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">patching file app/test-pmd/cmdline_flow.c</span></div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">Hunk #1 succeeded at 7283 (offset -186 lines).</span></div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">[rongweil@gen-l-vrt-290 mlnx_dpdk]$ patch -d ./ -p 1 < 2.patch </span></div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">patching file drivers/net/mlx5/mlx5_flow.c</span></div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">Hunk #1 succeeded at 2384 with fuzz 1 (offset 15 lines).</span></div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">patching file drivers/net/mlx5/mlx5_flow_hw.c</span></div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">Hunk #1 FAILED at 6104.</span></div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">Hunk #2 FAILED at 6129.</span></div>
<div class="elementToProof"><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">2 out of 2 hunks FAILED -- saving rejects to file drivers/net/mlx5/mlx5_flow_hw.c.rej</span></div>
<div class="elementToProof"><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"><br>
</span></div>
<div class="elementToProof"><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"><a href="mailto:rasland@nvidia.com" id="OWAAM92987" class="tWKOu mention ms-bgc-nlr ms-fcl-b">@Raslan
Darawsheh</a>Do I need to switch to main branch when sending patches to community?</span></div>
<div class="elementToProof"><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"><br>
</span></div>
<div id="Signature">
<p><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">BR</span></p>
<p><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">Rongwei</span></p>
<p><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </span></p>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Ferruh Yigit <ferruh.yigit@amd.com><br>
<b>Sent:</b> Thursday, February 22, 2024 0:42<br>
<b>To:</b> rongwei liu <rongweil@nvidia.com>; dev@dpdk.org <dev@dpdk.org>; Matan Azrad <matan@nvidia.com>; Slava Ovsiienko <viacheslavo@nvidia.com>; Ori Kam <orika@nvidia.com>; Suanming Mou <suanmingm@nvidia.com>; NBU-Contact-Thomas Monjalon (EXTERNAL) <thomas@monjalon.net><br>
<b>Cc:</b> Michael Baum <michaelba@nvidia.com>; stable@dpdk.org <stable@dpdk.org>; Dariusz Sosnowski <dsosnowski@nvidia.com>; Aman Singh <aman.deep.singh@intel.com>; Yuying Zhang <yuying.zhang@intel.com><br>
<b>Subject:</b> Re: [PATCH v1 1/2] app/testpmd: fix modify tag typo</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">External email: Use caution opening links or attachments<br>
<br>
<br>
On 2/21/2024 4:33 PM, Ferruh Yigit wrote:<br>
> On 2/21/2024 7:10 AM, Rongwei Liu wrote:<br>
>> Update the name to the right one: "src_tag_index"<br>
>><br>
>> Fixes: 7ea38955b ("ethdev: update MPLS header modification API")<br>
>> Cc: stable@dpdk.org<br>
>><br>
>> Signed-off-by: Rongwei Liu <rongweil@nvidia.com><br>
>> Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>><br>
><br>
> Acked-by: Ferruh Yigit <ferruh.yigit@amd.com><br>
><br>
<br>
btw, fixes commit is wrong, it should be [1], I guess this is related to<br>
the tree you are using as other patch has similar issue.<br>
<br>
<br>
[1]<br>
Fixes: c23626f27b09 ("ethdev: add MPLS header modification")<br>
</div>
</span></font></div>
</body>
</html>