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 1DC5646A81 for ; Sat, 28 Jun 2025 20:11:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E2C8E40277; Sat, 28 Jun 2025 20:11:10 +0200 (CEST) Received: from dmx.alabs.net (dmx.alabs.net [52.211.35.88]) by mails.dpdk.org (Postfix) with ESMTP id 2149040144 for ; Sat, 28 Jun 2025 20:11:10 +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 5716F84747F; Sat, 28 Jun 2025 21:11:09 +0300 (IDT) DKIM-Filter: OpenDKIM Filter v2.11.0 dmx.alabs.net 5716F84747F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alabs.net; s=alabs; t=1751134269; bh=FoyTMxOEy8Z/owqevD0/eb+Ds9cUquBtyqQczrpxdjI=; h=Date:From:To:Subject:List-ID:From; b=Kr9MLOsbVx2CMtGkAGkH0XfF2uxc+2WdlhEE5v1Bvn/7dQjb3ELcsj9Y2U9A5R6UN R0Hn9CXrJ/wyHJ0ckoo9wLbE6V2AQ304eMA31dEll7+pFJEFTvSR8R1lvdwsEhAXMT 6goIPRJ+6zzIlA9xo4H8xIh6lqwe+XE9gIc5Cx2I= 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 4CFC812A92F; Sat, 28 Jun 2025 21:11:09 +0300 (IDT) Date: Sat, 28 Jun 2025 21:11:09 +0300 (IDT) From: al-sw-devops@alabs.net To: test-report@dpdk.org, atrwajee@amazon.com Message-ID: <249711518.16155.1751134269313@ip-10-159-234-77.eu-west-1.compute.internal> Subject: |FAILURE| pw154804-154821 Description: Apply error encountered MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_16154_1271831966.1751134269309" 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_16154_1271831966.1751134269309 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/154821 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.8.0-1030-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 (2eca0f4cd5daf6cd54b8705f6f76f3003c923912) Done: main commit 2eca0f4cd5daf6cd54b8705f6f76f3003c923912 Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (62428fc90bb6f4ad678024ce8183702b534dc570) Applying patch... Failed to apply patch: Applying: add some basic files about hinic3 driver Using index info to reconstruct a base tree... M .mailmap M doc/guides/rel_notes/release_25_07.rst Falling back to patching base and 3-way merge... Auto-merging doc/guides/rel_notes/release_25_07.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst Auto-merging .mailmap error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 add some basic files about hinic3 driver 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 (2eca0f4cd5daf6cd54b8705f6f76f3003c923912) Applying patch... Failed to apply patch: Applying: add some basic files about hinic3 driver Using index info to reconstruct a base tree... M .mailmap M doc/guides/rel_notes/release_25_07.rst Falling back to patching base and 3-way merge... Auto-merging doc/guides/rel_notes/release_25_07.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst Auto-merging .mailmap error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 add some basic files about hinic3 driver 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". FAILURE Test environment (x86_64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.8.0-1029-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 (2eca0f4cd5daf6cd54b8705f6f76f3003c923912) Done: main commit 2eca0f4cd5daf6cd54b8705f6f76f3003c923912 Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (62428fc90bb6f4ad678024ce8183702b534dc570) Applying patch... Applying: add some basic files about hinic3 driver Using index info to reconstruct a base tree... M .mailmap M doc/guides/rel_notes/release_25_07.rst Falling back to patching base and 3-way merge... Auto-merging doc/guides/rel_notes/release_25_07.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst Auto-merging .mailmap error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 add some basic files about hinic3 driver 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 (2eca0f4cd5daf6cd54b8705f6f76f3003c923912) Applying patch... Applying: add some basic files about hinic3 driver Using index info to reconstruct a base tree... M .mailmap M doc/guides/rel_notes/release_25_07.rst Falling back to patching base and 3-way merge... Auto-merging doc/guides/rel_notes/release_25_07.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_25_07.rst Auto-merging .mailmap error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 add some basic files about hinic3 driver 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". FAILURE ------=_Part_16154_1271831966.1751134269309--