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 EDC5646CAC for ; Mon, 4 Aug 2025 20:35:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E94A44028C; Mon, 4 Aug 2025 20:35:17 +0200 (CEST) Received: from dmx.alabs.net (dmx.alabs.net [52.211.35.88]) by mails.dpdk.org (Postfix) with ESMTP id 7D6324028C for ; Mon, 4 Aug 2025 20:35:16 +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 39FB88475F7; Mon, 4 Aug 2025 21:35:16 +0300 (IDT) DKIM-Filter: OpenDKIM Filter v2.11.0 dmx.alabs.net 39FB88475F7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alabs.net; s=alabs; t=1754332516; bh=tDr1Lf7ZJ29b/DyFQ06riV4mGh8uNmjPgwGa/qbME0E=; h=Date:From:To:Subject:List-ID:From; b=TgiSTGSyutnf8YB9BZIm+FE40uL69D/wl7x1nFjHY9379h1AvirAef8dfGOoSBUab m2C33lZR/EaQ5/7b7835zlrEmvQ305SJpSuM1ocucK8kZjYAQ9hIIAt4OrkBHPZFQ9 BvSDJmAYeed5vIOPnfFdhYpYGAcBPySimUHhFqbY= 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 2FDFE12ACA7; Mon, 4 Aug 2025 21:35:16 +0300 (IDT) Date: Mon, 4 Aug 2025 21:35:16 +0300 (IDT) From: al-sw-devops@alabs.net To: test-report@dpdk.org, atrwajee@amazon.com, shaibran@amazon.com Message-ID: <478037068.6917.1754332516194@ip-10-159-234-77.eu-west-1.compute.internal> Subject: |FAILURE| pw155603-155633 ethdev: Reject conflicting TX offloads configuration MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_6916_842635070.1754332516187" 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_6916_842635070.1754332516187 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/155633 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 (38543d33bd47fc0ee21f59db80a8763620741879) Done: main commit 38543d33bd47fc0ee21f59db80a8763620741879 Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (507dd6a18ebcae562fd0539bddbf499a4b891bb7) Applying patch... Failed to apply patch: Applying: ethdev: Reject conflicting TX offloads configuration Using index info to reconstruct a base tree... M lib/ethdev/rte_ethdev.c Falling back to patching base and 3-way merge... Auto-merging lib/ethdev/rte_ethdev.c CONFLICT (content): Merge conflict in lib/ethdev/rte_ethdev.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 ethdev: Reject conflicting TX offloads configuration 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: ['lib/ethdev/rte_ethdev.c'] Trying to checkout branch: origin/main Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879) Applying patch... Failed to apply patch: Applying: ethdev: Reject conflicting TX offloads configuration Applying: ethdev: Reject conflicting TX offloads configuration Using index info to reconstruct a base tree... M lib/ethdev/rte_ethdev.c Falling back to patching base and 3-way merge... Auto-merging lib/ethdev/rte_ethdev.c CONFLICT (content): Merge conflict in lib/ethdev/rte_ethdev.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 ethdev: Reject conflicting TX offloads configuration 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: ['lib/ethdev/rte_ethdev.c'] FAILURE Test environment (x86_64): 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 (x86_64) Cleaning repository state... Trying to checkout branch: origin/main Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879) Done: main commit 38543d33bd47fc0ee21f59db80a8763620741879 Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (507dd6a18ebcae562fd0539bddbf499a4b891bb7) Applying patch... Applying: ethdev: Reject conflicting TX offloads configuration Using index info to reconstruct a base tree... M lib/ethdev/rte_ethdev.c Falling back to patching base and 3-way merge... Auto-merging lib/ethdev/rte_ethdev.c CONFLICT (content): Merge conflict in lib/ethdev/rte_ethdev.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 ethdev: Reject conflicting TX offloads configuration 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: ['lib/ethdev/rte_ethdev.c'] Trying to checkout branch: origin/main Checked out to main (38543d33bd47fc0ee21f59db80a8763620741879) Applying patch... Applying: ethdev: Reject conflicting TX offloads configuration Applying: ethdev: Reject conflicting TX offloads configuration Using index info to reconstruct a base tree... M lib/ethdev/rte_ethdev.c Falling back to patching base and 3-way merge... Auto-merging lib/ethdev/rte_ethdev.c CONFLICT (content): Merge conflict in lib/ethdev/rte_ethdev.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 ethdev: Reject conflicting TX offloads configuration 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: ['lib/ethdev/rte_ethdev.c'] FAILURE ------=_Part_6916_842635070.1754332516187--