I am using the master-net-mlx branch as base to verify. And cross-checked the main and master-net-mlx branch diverage now. Patch 1 was good and patch 2 failed to apply on the main branch.
[rongweil@gen-l-vrt-290 mlnx_dpdk]$ patch -d ./ -p 1 < 1.patch patching file app/test-pmd/cmdline_flow.c Hunk #1 succeeded at 7283 (offset -186 lines). [rongweil@gen-l-vrt-290 mlnx_dpdk]$ patch -d ./ -p 1 < 2.patch patching file drivers/net/mlx5/mlx5_flow.c Hunk #1 succeeded at 2384 with fuzz 1 (offset 15 lines). patching file drivers/net/mlx5/mlx5_flow_hw.c Hunk #1 FAILED at 6104. Hunk #2 FAILED at 6129. 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/mlx5/mlx5_flow_hw.c.rej @Raslan Darawsheh<mailto:[email protected]>Do I need to switch to main branch when sending patches to community? BR Rongwei ________________________________ From: Ferruh Yigit <[email protected]> Sent: Thursday, February 22, 2024 0:42 To: rongwei liu <[email protected]>; [email protected] <[email protected]>; Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]> Cc: Michael Baum <[email protected]>; [email protected] <[email protected]>; Dariusz Sosnowski <[email protected]>; Aman Singh <[email protected]>; Yuying Zhang <[email protected]> Subject: Re: [PATCH v1 1/2] app/testpmd: fix modify tag typo External email: Use caution opening links or attachments On 2/21/2024 4:33 PM, Ferruh Yigit wrote: > On 2/21/2024 7:10 AM, Rongwei Liu wrote: >> Update the name to the right one: "src_tag_index" >> >> Fixes: 7ea38955b ("ethdev: update MPLS header modification API") >> Cc: [email protected] >> >> Signed-off-by: Rongwei Liu <[email protected]> >> Acked-by: Dariusz Sosnowski <[email protected]>> > > Acked-by: Ferruh Yigit <[email protected]> > btw, fixes commit is wrong, it should be [1], I guess this is related to the tree you are using as other patch has similar issue. [1] Fixes: c23626f27b09 ("ethdev: add MPLS header modification")
