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 CF69346ECE for ; Thu, 11 Sep 2025 20:46:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B610140650; Thu, 11 Sep 2025 20:46:40 +0200 (CEST) Received: from dmx.alabs.net (dmx.alabs.net [52.211.35.88]) by mails.dpdk.org (Postfix) with ESMTP id 4BF0E40285 for ; Thu, 11 Sep 2025 20:46:39 +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 DC19E8475F8; Thu, 11 Sep 2025 21:46:37 +0300 (IDT) DKIM-Filter: OpenDKIM Filter v2.11.0 dmx.alabs.net DC19E8475F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alabs.net; s=alabs; t=1757616397; bh=haN+FohQuI/CskusKlaskLE8f2vtUfKHE1abpWIDko0=; h=Date:From:To:Subject:List-ID:From; b=U/k0Lec5I3+k2XmmEJM0cAs04egNYrU5GWf2jsms0ZXF3Z5OrgxltaloWYwlKqxp3 Fe+ay2r6YOXoVCSZu1mCvHVOin64/v9jCHhAEysJxe6T3RhWwORIbjvNWWG7zBHEsU aTSX79mksZ/mMdh9KjhH1K/YPAdTvBTN5jo1OFLg= 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 D4DAF12ACA7; Thu, 11 Sep 2025 21:46:37 +0300 (IDT) Date: Thu, 11 Sep 2025 21:46:37 +0300 (IDT) From: al-sw-devops@alabs.net To: test-report@dpdk.org, atrwajee@amazon.com, shaibran@amazon.com Message-ID: <475311872.16528.1757616397872@ip-10-159-234-77.eu-west-1.compute.internal> Subject: |FAILURE| pw156566-156567 Description: Apply error encountered MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_16527_1279072041.1757616397867" 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_16527_1279072041.1757616397867 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/156567 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 (f41d2db45d8a23c3315929c190d098154732a1ce) Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce Trying to checkout branch: origin/next-dts-for-main Checked out to next-dts-for-main (d382a5035be89b8b3259bc93ab4bae6b6b948aa5) Applying patch... Failed to apply patch: Applying: dts: add RSS functions to testpmd Using index info to reconstruct a base tree... A dts/api/testpmd/__init__.py A dts/api/testpmd/types.py Falling back to patching base and 3-way merge... CONFLICT (modify/delete): dts/api/testpmd/types.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/types.py left in tree. CONFLICT (modify/delete): dts/api/testpmd/__init__.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/__init__.py left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dts: add RSS functions to testpmd 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: ['dts/api/testpmd/__init__.py', 'dts/api/testpmd/types.py'] Trying to checkout branch: origin/main Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce) Applying patch... Failed to apply patch: Applying: dts: add RSS functions to testpmd Using index info to reconstruct a base tree... A dts/api/testpmd/__init__.py A dts/api/testpmd/types.py Falling back to patching base and 3-way merge... CONFLICT (modify/delete): dts/api/testpmd/types.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/types.py left in tree. CONFLICT (modify/delete): dts/api/testpmd/__init__.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/__init__.py left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dts: add RSS functions to testpmd 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: ['dts/api/testpmd/__init__.py', 'dts/api/testpmd/types.py'] 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 (f41d2db45d8a23c3315929c190d098154732a1ce) Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce Trying to checkout branch: origin/next-dts-for-main Checked out to next-dts-for-main (d382a5035be89b8b3259bc93ab4bae6b6b948aa5) Applying patch... Applying: dts: add RSS functions to testpmd Using index info to reconstruct a base tree... A dts/api/testpmd/__init__.py A dts/api/testpmd/types.py Falling back to patching base and 3-way merge... CONFLICT (modify/delete): dts/api/testpmd/types.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/types.py left in tree. CONFLICT (modify/delete): dts/api/testpmd/__init__.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/__init__.py left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dts: add RSS functions to testpmd 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: ['dts/api/testpmd/__init__.py', 'dts/api/testpmd/types.py'] Trying to checkout branch: origin/main Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce) Applying patch... Applying: dts: add RSS functions to testpmd Using index info to reconstruct a base tree... A dts/api/testpmd/__init__.py A dts/api/testpmd/types.py Falling back to patching base and 3-way merge... CONFLICT (modify/delete): dts/api/testpmd/types.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/types.py left in tree. CONFLICT (modify/delete): dts/api/testpmd/__init__.py deleted in HEAD and modified in dts: add RSS functions to testpmd. Version dts: add RSS functions to testpmd of dts/api/testpmd/__init__.py left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dts: add RSS functions to testpmd 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: ['dts/api/testpmd/__init__.py', 'dts/api/testpmd/types.py'] FAILURE ------=_Part_16527_1279072041.1757616397867--