Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/77827 _apply issues_ Submitter: Junyu Jiang Date: 2020-09-16 03:10:02 Reply_mail: 20200916031002.42122-6-junyux.jiang@intel.com DPDK git baseline: Repo:dpdk-next-net-intel, CommitID: 6b3c28535b865cc93a9e0d15bb05a74f860b9053 Repo:dpdk, CommitID: e41d27a68df6939bef97a4afa6ffc32eb8b2c2c1 * Repo: dpdk-next-net-intel Author: Guinan Sun Date: Tue Sep 15 06:52:25 2020 +0000 net/i40e: fix recreate a flexible FDIR rule failed This patch fixes the failure of recreate flexible fdir rule. The root cause is that the flex_mask_flag is not reset during -- Falling back to patching base and 3-way merge... Auto-merging drivers/net/ice/ice_rxtx_vec_avx2.c CONFLICT (content): Merge conflict in drivers/net/ice/ice_rxtx_vec_avx2.c error: Failed to merge in the changes. Patch failed at 0001 net/ice: support flex Rx descriptor RxDID #22 Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". * Repo: dpdk Applying: net/ice: support flex Rx descriptor RxDID #22 error: sha1 information is lacking or useless (drivers/net/ice/ice_ethdev.c). error: could not build fake ancestor Patch failed at 0001 net/ice: support flex Rx descriptor RxDID #22 Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". DPDK STV team