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 2A97B43AFE for ; Mon, 12 Feb 2024 19:33:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F10DB40294; Mon, 12 Feb 2024 19:32:59 +0100 (CET) Received: from mail-yw1-f225.google.com (mail-yw1-f225.google.com [209.85.128.225]) by mails.dpdk.org (Postfix) with ESMTP id 4392F40274 for ; Mon, 12 Feb 2024 19:32:59 +0100 (CET) Received: by mail-yw1-f225.google.com with SMTP id 00721157ae682-60779014458so4525317b3.0 for ; Mon, 12 Feb 2024 10:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1707762778; x=1708367578; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=qH/lYx4sAbpmPifrJT/LetPdSeagdkIeRRdJnF/cU80=; b=WPwir5RdOYM6oRlGpL5bvscilQxvvAPPKNtCnAnk17tPx2cfjhhJuCqJS2SI/JK5dR I6phOTZZp1TX99/mkAHNdaro0LcfVTzUSzBeWLLezR7irnsjYL46OqqTa3nNfYUXkGyY yoZaKnMQSNDxqR/LcBGmu2xD61XD4IUTEOpWk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707762778; x=1708367578; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qH/lYx4sAbpmPifrJT/LetPdSeagdkIeRRdJnF/cU80=; b=vD7W7C7dw4RGhfDJdLX3coVhtPJJebK5Sop4DyRnzWT53FPistMTj3Qr+QiFeCkgQX GTF0HrZ0wVnIYAUdh1pa+jueyXWbBdq5xjiGH4I2n3nINy5gUbkmlg9a2RN29LNxRBVY LPO02f5fr7NE2XQOy1y23AbLkaOow1d0FGa3xBI0M1Qnh4cpuU4f5LOHNuQCp6+XHgd2 8KwMR7fjkTq6W3jlsdG2NXdkfAz6qe40bURZL0ViscB00vyFJnxTclNoVWfVuk0ukEUM h6Ky0W0BWs31YCy9O+5ajbP5kjHNJ8y+Q6wCi93ALGsEYMscHRE2r6p4x18aGR5XHhuE js+g== X-Gm-Message-State: AOJu0Yx5ELh17E/+WordBcESl6DfP1TTAnSTJVDPMgPvM55c/WRc6lLI gGbIONtlkcESJ+8t16aJ3/eH8ZEYNDe0t68yIAxUIAOUCDCqnZNXNDYNS6kSwS8Ke1IJeP7tqgQ kZ+BNCqa+PG8y6mRCzw8r4NkNoUYVEkdctCViNRykpkWYw/KL2v9lngq4 X-Google-Smtp-Source: AGHT+IGnaaBBoIj9jR9V0Ruvz62W0a4G/5ciRZjSjA9WUkHYOTa2JVKzsnH1qoxL15MYpCojucOQKayO/lpX X-Received: by 2002:a0d:d382:0:b0:604:7b9e:f622 with SMTP id v124-20020a0dd382000000b006047b9ef622mr4389322ywd.30.1707762778532; Mon, 12 Feb 2024 10:32:58 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [2606:4100:3880:1234::84]) by smtp-relay.gmail.com with ESMTPS id v133-20020a81488b000000b00604839594desm410095ywa.38.2024.02.12.10.32.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2024 10:32:58 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Mon, 12 Feb 2024 10:32:58 -0800 (PST) Message-ID: <65ca645a.810a0220.216f8.a2e3SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.2] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id 27C196043484; Mon, 12 Feb 2024 13:32:58 -0500 (EST) Subject: |WARNING| pw136601 [PATCH] [v6] ethdev: add template table resize API From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu Content-Type: text/plain 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 Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/136601 _apply patch failure_ Submitter: Gregory Etelson Date: Monday, February 12 2024 18:12:23 Applied on: CommitID:7c75d453b719989092e0a53f0c049dc6c247bec0 Apply patch set 136601 failed: Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3) Trying to checkout branch: main Checked out to main (39fbd379aa448fda098575f6052dfcdf1dc8e23b) Done: main commit 39fbd379aa448fda098575f6052dfcdf1dc8e23b Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (7c75d453b719989092e0a53f0c049dc6c247bec0) Applying patch... Failed to apply patch: Applying: ethdev: add template table resize API Using index info to reconstruct a base tree... M app/test-pmd/cmdline_flow.c M app/test-pmd/config.c M doc/guides/rel_notes/release_24_03.rst M doc/guides/testpmd_app_ug/testpmd_funcs.rst M lib/ethdev/ethdev_trace_points.c M lib/ethdev/rte_flow.c M lib/ethdev/rte_flow.h M lib/ethdev/rte_flow_driver.h M lib/ethdev/version.map Falling back to patching base and 3-way merge... Auto-merging lib/ethdev/version.map CONFLICT (content): Merge conflict in lib/ethdev/version.map Auto-merging lib/ethdev/rte_flow_driver.h Auto-merging lib/ethdev/rte_flow.h Auto-merging lib/ethdev/rte_flow.c CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c Auto-merging lib/ethdev/ethdev_trace_points.c Auto-merging doc/guides/testpmd_app_ug/testpmd_funcs.rst Auto-merging doc/guides/rel_notes/release_24_03.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst Auto-merging app/test-pmd/config.c Auto-merging app/test-pmd/cmdline_flow.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 ethdev: add template table resize API 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: main Checked out to main (7c75d453b719989092e0a53f0c049dc6c247bec0) Applying patch... Failed to apply patch: Applying: ethdev: add template table resize API Using index info to reconstruct a base tree... M app/test-pmd/cmdline_flow.c M app/test-pmd/config.c M doc/guides/rel_notes/release_24_03.rst M doc/guides/testpmd_app_ug/testpmd_funcs.rst M lib/ethdev/ethdev_trace_points.c M lib/ethdev/rte_flow.c M lib/ethdev/rte_flow.h M lib/ethdev/rte_flow_driver.h M lib/ethdev/version.map Falling back to patching base and 3-way merge... Auto-merging lib/ethdev/version.map CONFLICT (content): Merge conflict in lib/ethdev/version.map Auto-merging lib/ethdev/rte_flow_driver.h Auto-merging lib/ethdev/rte_flow.h Auto-merging lib/ethdev/rte_flow.c CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c Auto-merging lib/ethdev/ethdev_trace_points.c Auto-merging doc/guides/testpmd_app_ug/testpmd_funcs.rst Auto-merging doc/guides/rel_notes/release_24_03.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst Auto-merging app/test-pmd/config.c Auto-merging app/test-pmd/cmdline_flow.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 ethdev: add template table resize API 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". https://lab.dpdk.org/results/dashboard/patchsets/29120/ UNH-IOL DPDK Community Lab