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:rasl...@nvidia.com>Do I need to switch to main branch when sending patches to community? BR Rongwei ________________________________ From: Ferruh Yigit <ferruh.yi...@amd.com> Sent: Thursday, February 22, 2024 0:42 To: rongwei liu <rongw...@nvidia.com>; dev@dpdk.org <dev@dpdk.org>; Matan Azrad <ma...@nvidia.com>; Slava Ovsiienko <viachesl...@nvidia.com>; Ori Kam <or...@nvidia.com>; Suanming Mou <suanmi...@nvidia.com>; NBU-Contact-Thomas Monjalon (EXTERNAL) <tho...@monjalon.net> Cc: Michael Baum <michae...@nvidia.com>; sta...@dpdk.org <sta...@dpdk.org>; Dariusz Sosnowski <dsosnow...@nvidia.com>; Aman Singh <aman.deep.si...@intel.com>; Yuying Zhang <yuying.zh...@intel.com> 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: sta...@dpdk.org >> >> Signed-off-by: Rongwei Liu <rongw...@nvidia.com> >> Acked-by: Dariusz Sosnowski <dsosnow...@nvidia.com>> > > Acked-by: Ferruh Yigit <ferruh.yi...@amd.com> > 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")
