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 A36B943AAF for ; Wed, 7 Feb 2024 23:43:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74E2D402A9; Wed, 7 Feb 2024 23:43:23 +0100 (CET) Received: from mail-yw1-f226.google.com (mail-yw1-f226.google.com [209.85.128.226]) by mails.dpdk.org (Postfix) with ESMTP id E80914027D for ; Wed, 7 Feb 2024 23:43:21 +0100 (CET) Received: by mail-yw1-f226.google.com with SMTP id 00721157ae682-604a184703bso4275237b3.3 for ; Wed, 07 Feb 2024 14:43:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1707345801; x=1707950601; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=M2vqYAx0FG/gUAHHcOqrMbeMOlM0uOf/HRSJUyrJzr4=; b=hN+6Jy+YBlYpiNp1/P3ln5La8tDqYyi4f4Tjj1eeXQ88zPZS3V1CMYdnfKQ7nJirUu 7KVQK3+qmLvSIUplXXxzEkvg3JIBkb05jren5FlPg3hj0mNvgwWTYNBHHhp+Lx1yQ02D pyjmkJq0jVaUnmBlKoZnnFHYC+S+9L1T8RE0A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707345801; x=1707950601; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M2vqYAx0FG/gUAHHcOqrMbeMOlM0uOf/HRSJUyrJzr4=; b=qKblBs53Y5pBAHYaU23E4YmtlWoBxvU2M9bmCVCGFHx+p2m3wsZEuxMazSL0v1bVCA zKmCZf0ybEnfsxDB7VwY1H1GGXvszOwrlJFDX/QdW6D5N2zYvMRuIJTnBgOXyRfuZo5n Liivv7lFDTIxN8C1HJbwKtJAbxy3wnaD46qNatA6I6FmNzbLxjTLFyokClScHA6fGIHT nBGusntihUDivB6uiCwXEP+OAze7+nmafR31p05TJp30GwnlgOvpSD8gLYtEjYyX3hO/ m+1OfyktEvAOyB1LCMvlOYwE7ltwSjGLgtv6zC0riObDd7n2xG9YbIw5lUNFoxckyThc Ftbg== X-Gm-Message-State: AOJu0Yw9byo5+Xnqxtxtpdr6U0lHvFvGwzLiUkMKojNn/nDbdOodklzS cuDCIknzTD3G3P0c3YALyJA4SVsO1c4PUSAce20zwLKT2d87Aj80BmDy0j2VanCFlepLD7sUN7f MQmtk0cqlo3fdszPAP8VMMs91frpssAPZsU8URg8WV9ZFzcgQ41jjI+LQ X-Google-Smtp-Source: AGHT+IF3e3yCVWpkFYzW5qHIh+h4X18ZA7WS6d3avw/9EdZJeVFGp0OcjriMZEfNL59WrsgcZr3Q9ofWDU4I X-Received: by 2002:a81:8d05:0:b0:5f8:c3a:6989 with SMTP id d5-20020a818d05000000b005f80c3a6989mr5764279ywg.34.1707345801267; Wed, 07 Feb 2024 14:43:21 -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 o7-20020a0de507000000b00602da74198dsm86155ywe.0.2024.02.07.14.43.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2024 14:43:21 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Wed, 07 Feb 2024 14:43:21 -0800 (PST) Message-ID: <65c40789.0d0a0220.7993e.555bSMTPIN_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 CE5D86052516; Wed, 7 Feb 2024 17:43:20 -0500 (EST) Subject: |WARNING| pw136505 [PATCH] [v4] 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/136505 _apply patch failure_ Submitter: Gregory Etelson Date: Wednesday, February 07 2024 17:36:47 Applied on: CommitID:67d787e43c304dba6be55f0ce93df006d0997e48 Apply patch set 136505 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 (a4ce111cc89f580b8c4aad51bdb061acbdfde86b) Done: main commit a4ce111cc89f580b8c4aad51bdb061acbdfde86b Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (67d787e43c304dba6be55f0ce93df006d0997e48) 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 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/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 (67d787e43c304dba6be55f0ce93df006d0997e48) 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 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/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/29088/ UNH-IOL DPDK Community Lab