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 50E5343AD9 for ; Sun, 11 Feb 2024 10:52:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2869740283; Sun, 11 Feb 2024 10:52:58 +0100 (CET) Received: from mail-pg1-f225.google.com (mail-pg1-f225.google.com [209.85.215.225]) by mails.dpdk.org (Postfix) with ESMTP id AF7644025D for ; Sun, 11 Feb 2024 10:52:56 +0100 (CET) Received: by mail-pg1-f225.google.com with SMTP id 41be03b00d2f7-5d8b519e438so2007023a12.1 for ; Sun, 11 Feb 2024 01:52:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1707645176; x=1708249976; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=nSzTo6zOketLYWeUYcnivR6SewUtqXw+uHA9WRqR13s=; b=Z9XCcSEFZ4G2x7HDrliLBj4XHHiqjBNiQ13nrq3poCkdZgdHcfNJCdwDR4lMJG5bOE swwLWr3asgsop+zDWSMOXGMNw5LRNEPR5BnZEf/jArl5p9142lyTIUQD1sSV3Ylvv0if 0BgsoXeFCnZq1bqJQk8NCfNYMNgnFjhi/ufq8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707645176; x=1708249976; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nSzTo6zOketLYWeUYcnivR6SewUtqXw+uHA9WRqR13s=; b=bLHC0dUMY0mqhIUgwmdC4ve3b66OVtUBpbaHqZP4SWrvprJj1T1F4v/N+n4rElJKv/ 1tAgfEIgM+oFZBnmKiPdYm+ij4I5TvMn4VfNQ+re1rnqFoAwj6lxqkWKdQ67xgf85X+Z fDhb7o5Cu//DJQwKy3ZUmWE4hq21ClCRW2p3SReOawwauFJ9R0W70D1RfDam7eMY/njc hKTJZGsCsrvniA1v2+zWSvYe+VG/9XBqVX0FNppwYiZKahPddrtWA61E6BYZHVxY+OQI 7YdLuRuHgYr8aeAPuM0OUQ+BWLsXJTtZ5+3WNmZvEg+i9juLvQOELFLf70j+yvS1z0b4 Olig== X-Gm-Message-State: AOJu0Yy9gIete0M+w0OjXwJOU4BiEyAvVSQFG3r5iDJokOf2kpXF+CRb Xd1I0ISzAN8dDss2oeAK3tAnSk909ldOz4/uxDjUHTpoXfHEkTZPQElBfK7D7VjfMhVdhLm/8b4 FKtlHnJQdcDvyPcuofZNn7d8DGbyVb7FqI7CykRcf X-Google-Smtp-Source: AGHT+IGxdIutB5b4Et9Y/nyVRGUEnm/23Jo6dT669+Pc+gcEJv5RnoxLzjrOIhyzYgKzQltPUDAUPI4PWOAp X-Received: by 2002:a17:903:40cb:b0:1d8:fafa:f923 with SMTP id t11-20020a17090340cb00b001d8fafaf923mr5149292pld.10.1707645175906; Sun, 11 Feb 2024 01:52:55 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id jf13-20020a170903268d00b001da28ae89b3sm3818plb.35.2024.02.11.01.52.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2024 01:52:55 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Sun, 11 Feb 2024 01:52:55 -0800 (PST) Message-ID: <65c898f7.170a0220.41e53.02c3SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.3] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id 65EA86052515; Sun, 11 Feb 2024 04:52:54 -0500 (EST) Subject: |WARNING| pw136586 [PATCH] [v5] 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/136586 _apply patch failure_ Submitter: Gregory Etelson Date: Sunday, February 11 2024 09:30:53 Applied on: CommitID:7c75d453b719989092e0a53f0c049dc6c247bec0 Apply patch set 136586 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 (ec932cb907b72291af28406d1621d6837771e10c) Done: main commit ec932cb907b72291af28406d1621d6837771e10c 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/29113/ UNH-IOL DPDK Community Lab