From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EE78748874 for ; Tue, 30 Sep 2025 20:49:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8E6D40150; Tue, 30 Sep 2025 20:49:23 +0200 (CEST) Received: from dmx.alabs.net (dmx.alabs.net [52.211.35.88]) by mails.dpdk.org (Postfix) with ESMTP id 7DA3640150 for ; Tue, 30 Sep 2025 20:49:17 +0200 (CEST) Received: from ec2-52-49-224-164.eu-west-1.compute.amazonaws.com (unknown [10.122.5.122]) by dmx.alabs.net (Postfix) with ESMTP id 19E1A8475F7; Tue, 30 Sep 2025 21:49:16 +0300 (IDT) DKIM-Filter: OpenDKIM Filter v2.11.0 dmx.alabs.net 19E1A8475F7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alabs.net; s=alabs; t=1759258156; bh=9b3vPS8Yza6kHB15n3/me+Hx8J4H/7dzgCIu9O907q0=; h=Date:From:To:Subject:List-ID:From; b=nulnsWzFh8OTr2T0Q7FUTUwaZ1YoEkit1ArGl6ZWzhEW/FyqImDleHjv3F+42MXbX 5IwGxRqJ5clqJQwyTRCXqjntXoTBwlrbc4tszRraJyV3RKvQnFx2uQu/04ANYYDzDU O9EEIHocGntAYc/2NlL7GL0poyCe+9g+XpQIPNfc= Received: from ip-10-159-234-77.eu-west-1.compute.internal (swci-jnk-k2apps.alabs.net [10.159.234.77]) by ec2-52-49-224-164.eu-west-1.compute.amazonaws.com (Postfix) with ESMTP id 11EC512ACA9; Tue, 30 Sep 2025 21:49:16 +0300 (IDT) Date: Tue, 30 Sep 2025 21:49:16 +0300 (IDT) From: al-sw-devops@alabs.net To: test-report@dpdk.org, atrwajee@amazon.com, shaibran@amazon.com Message-ID: <19547213.7328.1759258156076@ip-10-159-234-77.eu-west-1.compute.internal> Subject: |FAILURE| pw157056-157056 Description: Apply error encountered MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_7327_1837944742.1759258156066" X-Jenkins-Job: Community-Fast-tests X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org ------=_Part_7327_1837944742.1759258156066 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 ------=_Part_7327_1837944742.1759258156066--