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 0E96248BFA for ; Mon, 1 Dec 2025 15:57:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A0DC402EB; Mon, 1 Dec 2025 15:57:40 +0100 (CET) Received: from dmx.alabs.net (dmx.alabs.net [52.211.35.88]) by mails.dpdk.org (Postfix) with ESMTP id B39C44021F for ; Mon, 1 Dec 2025 15:57:38 +0100 (CET) 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 81E4B8477AF; Mon, 1 Dec 2025 16:57:27 +0200 (IST) DKIM-Filter: OpenDKIM Filter v2.11.0 dmx.alabs.net 81E4B8477AF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alabs.net; s=alabs; t=1764601047; bh=dzCVEAHkYzWuKoptIrFgZ/1UaT7kGEELgQi1Dg/FUfg=; h=Date:From:To:Subject:List-ID:From; b=PisHXSASWSXfvjkk+Dq3dNmwlu/r+0OdxnHny6sRrcrnh0OL2UuFWuk4nyHIsaw88 QJamRnrCscFYLoLfEDbfDuOO/Y5dvCNnwZUS6yhpjzyFmUDpJR+Wt9t/XBeAPnVF3B 21t2jIu6A9MepLhNQhr1IDBNC91f0WZleXjMSkGA= Received: from swci-jnk-k2appn.alabs.net (ip-10-159-234-77.eu-west-1.compute.internal [10.159.234.77]) by ec2-52-49-224-164.eu-west-1.compute.amazonaws.com (Postfix) with ESMTP id 7A42812ACA6; Mon, 1 Dec 2025 16:57:27 +0200 (IST) Received: from ip-10-159-234-77.eu-west-1.compute.internal (localhost [127.0.0.1]) by swci-jnk-k2appn.alabs.net (Postfix) with ESMTP id 771524385B4; Mon, 1 Dec 2025 16:57:27 +0200 (IST) Date: Mon, 1 Dec 2025 16:57:27 +0200 (IST) From: al-sw-devops@alabs.net To: test-report@dpdk.org, atrwajee@amazon.com, shaibran@amazon.com Message-ID: <198098817.2175.1764601047488@ip-10-159-234-77.eu-west-1.compute.internal> Subject: |FAILURE| pw159030-159030 Description: Apply error encountered MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_2174_1747877222.1764601047485" 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_2174_1747877222.1764601047485 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/159030 Test Status Summary: +--------------+------------------+ | Architecture | DPDK Unit Test | +--------------+------------------+ | x86_64 | Not Tested | +--------------+------------------+ | arm64 | FAILURE | +--------------+------------------+ Test environment (aarch64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.14.0-1017-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 (ed957165eadbe60a47d5ec223578cdd1c13d0bd9) Done: main commit ed957165eadbe60a47d5ec223578cdd1c13d0bd9 Trying to checkout branch: origin/main Checked out to main (ed957165eadbe60a47d5ec223578cdd1c13d0bd9) Applying patch... Failed to apply patch: Applying: event/cnxk: fix offload flags Using index info to reconstruct a base tree... M drivers/event/cnxk/cn10k_eventdev.c M drivers/event/cnxk/cn10k_worker.h M drivers/event/cnxk/cn20k_eventdev.c M drivers/event/cnxk/cn20k_worker.h M drivers/net/cnxk/cn10k_rx.h M drivers/net/cnxk/cn20k_rx.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/cnxk/cn20k_rx.h CONFLICT (content): Merge conflict in drivers/net/cnxk/cn20k_rx.h Auto-merging drivers/net/cnxk/cn10k_rx.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 event/cnxk: fix offload flags 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/cnxk/cn20k_rx.h'] FAILURE ------=_Part_2174_1747877222.1764601047485--