|WARNING| pw154977 [PATCH v3] net/iavf: fix VLAN offload strip flag

|WARNING| pw154977 [PATCH v3] net/iavf: fix VLAN offload strip flag

[qemudev]

Test-Label: loongarch-compilation
Test-Status: WARNING
http://dpdk.org/patch/154977

_apply patch failure_

Submitter: Amiya Ranjan Mohakud <amiyaranjan.mohakud@gmail.com>
Date: Wed,  2 Jul 2025 23:52:51 +0530
DPDK git baseline: Repo:dpdk-next-net-intel
  Branch: main
  CommitID: 9d9c24079d2f98ea595cefda4b60e1adf18f875d

Apply patch set 154977 failed:

Checking patch drivers/net/intel/iavf/iavf_ethdev.c...
error: while searching for:
}

static int
iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
{
	struct iavf_adapter *adapter =
		IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
	struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
	int err;

	if (adapter->closed)
		return -EIO;


error: patch failed: drivers/net/intel/iavf/iavf_ethdev.c:1379
error: drivers/net/intel/iavf/iavf_ethdev.c: patch does not apply

|SUCCESS| pw154977 [PATCH v3] net/iavf: fix VLAN offload strip flag

[checkpatch]

Test-Label: checkpatch
Test-Status: SUCCESS
http://dpdk.org/patch/154977

_coding style OK_

|WARNING| pw154977 [PATCH] [v3] net/iavf: fix VLAN offload strip flag

[dpdklab]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/154977

_apply patch failure_

Submitter: Amiya Ranjan Mohakud <amiyaranjan.mohakud@gmail.com>
Date: Wednesday, July 02 2025 18:22:51 
Applied on: CommitID:bd546772e1449ccc0789db338cc398815fa2636d
Apply patch set 154977 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: origin/main
Checked out to main (bd546772e1449ccc0789db338cc398815fa2636d)
Done: main commit bd546772e1449ccc0789db338cc398815fa2636d
Trying to checkout branch: origin/next-net-intel-for-next-net
Checked out to next-net-intel-for-next-net (9d9c24079d2f98ea595cefda4b60e1adf18f875d)
Applying patch...

Failed to apply patch:
Applying: net/iavf: fix VLAN offload strip flag
Using index info to reconstruct a base tree...
M	drivers/net/intel/iavf/iavf_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/iavf/iavf_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/intel/iavf/iavf_ethdev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/iavf: fix VLAN offload strip flag
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".


Trying to checkout branch: origin/main
Checked out to main (bd546772e1449ccc0789db338cc398815fa2636d)
Applying patch...

Failed to apply patch:
Applying: net/iavf: fix VLAN offload strip flag
Using index info to reconstruct a base tree...
M	drivers/net/intel/iavf/iavf_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/iavf/iavf_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/intel/iavf/iavf_ethdev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/iavf: fix VLAN offload strip flag
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".


https://lab.dpdk.org/results/dashboard/patchsets/33574/

UNH-IOL DPDK Community Lab