|FAILURE| pw157056-157056 Description: Apply error encountered

[al-sw-devops at alabs.net]

Test-Name: DPDK Fast test suite
Test-Label: aws-unit-testing
Test-Status: FAILURE
_Unit Testing Apply error encountered_
http://dpdk.org/patch/157056

Test Status Summary:

+--------------+------------------+
| Architecture | DPDK Unit Test   |
+--------------+------------------+
| x86_64       | FAILURE           |
+--------------+------------------+
| arm64        | FAILURE           |
+--------------+------------------+


Test environment (aarch64):
Description: Apply error encountered
OS : Ubuntu 24.04.1 LTS
Kernel : 6.14.0-1012-aws
NIC : Elastic Network Adapter
GCC : 13.3.0-6ubuntu2~24.04

Test last 100 lines (aarch64)
Cleaning repository state...
Trying to checkout branch: origin/main
Checked out to main (f3878b615e69a12087a6c5d212723478cfc79c31)
Done: main commit f3878b615e69a12087a6c5d212723478cfc79c31
Trying to checkout branch: origin/next-net-intel-for-next-net
Checked out to next-net-intel-for-next-net (9845e5848bbe337306fb6ae2a6b1ce5e6ab5b714)
Applying patch...

Failed to apply patch:
Applying: net/intel: add IDPF PCI class ID support
Using index info to reconstruct a base tree...
M	drivers/net/intel/idpf/idpf_common_device.h
M	drivers/net/intel/idpf/idpf_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/idpf/idpf_ethdev.c
Auto-merging drivers/net/intel/idpf/idpf_common_device.h
CONFLICT (content): Merge conflict in drivers/net/intel/idpf/idpf_common_device.h
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/intel: add IDPF PCI class ID support
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".


Patch failed. Checking for conflicts in .rst files...
Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/idpf/idpf_common_device.h']
Trying to checkout branch: origin/main
Checked out to main (f3878b615e69a12087a6c5d212723478cfc79c31)
Applying patch...

Failed to apply patch:
Applying: net/intel: add IDPF PCI class ID support
Using index info to reconstruct a base tree...
M	drivers/net/intel/idpf/idpf_common_device.h
M	drivers/net/intel/idpf/idpf_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/idpf/idpf_ethdev.c
Auto-merging drivers/net/intel/idpf/idpf_common_device.h
CONFLICT (content): Merge conflict in drivers/net/intel/idpf/idpf_common_device.h
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/intel: add IDPF PCI class ID support
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".


Patch failed. Checking for conflicts in .rst files...
Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/idpf/idpf_common_device.h']
FAILURE


Test environment (x86_64):
Description: Apply error encountered
OS : Ubuntu 24.04.1 LTS
Kernel : 6.14.0-1012-aws
NIC : Elastic Network Adapter
GCC : 13.3.0-6ubuntu2~24.04

Test last 100 lines (x86_64)
Cleaning repository state...
Trying to checkout branch: origin/main
Checked out to main (f3878b615e69a12087a6c5d212723478cfc79c31)
Done: main commit f3878b615e69a12087a6c5d212723478cfc79c31
Trying to checkout branch: origin/next-net-intel-for-next-net
Checked out to next-net-intel-for-next-net (9845e5848bbe337306fb6ae2a6b1ce5e6ab5b714)
Applying patch...
Applying: net/intel: add IDPF PCI class ID support
Using index info to reconstruct a base tree...
M	drivers/net/intel/idpf/idpf_common_device.h
M	drivers/net/intel/idpf/idpf_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/idpf/idpf_ethdev.c
Auto-merging drivers/net/intel/idpf/idpf_common_device.h
CONFLICT (content): Merge conflict in drivers/net/intel/idpf/idpf_common_device.h
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/intel: add IDPF PCI class ID support
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".



Patch failed. Checking for conflicts in .rst files...
Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/idpf/idpf_common_device.h']
Trying to checkout branch: origin/main
Checked out to main (f3878b615e69a12087a6c5d212723478cfc79c31)
Applying patch...
Applying: net/intel: add IDPF PCI class ID support
Using index info to reconstruct a base tree...
M	drivers/net/intel/idpf/idpf_common_device.h
M	drivers/net/intel/idpf/idpf_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/idpf/idpf_ethdev.c
Auto-merging drivers/net/intel/idpf/idpf_common_device.h
CONFLICT (content): Merge conflict in drivers/net/intel/idpf/idpf_common_device.h
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/intel: add IDPF PCI class ID support
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".



Patch failed. Checking for conflicts in .rst files...
Patch apply failed with conflicts in non-.rst files: ['drivers/net/intel/idpf/idpf_common_device.h']
FAILURE