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 803D443B33 for ; Wed, 14 Feb 2024 15:52:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7CB5D4026A; Wed, 14 Feb 2024 15:52:05 +0100 (CET) Received: from mail-vs1-f97.google.com (mail-vs1-f97.google.com [209.85.217.97]) by mails.dpdk.org (Postfix) with ESMTP id B6BDC40263 for ; Wed, 14 Feb 2024 15:52:04 +0100 (CET) Received: by mail-vs1-f97.google.com with SMTP id ada2fe7eead31-46d2d20c923so632332137.0 for ; Wed, 14 Feb 2024 06:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1707922324; x=1708527124; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=em+oQOcvRbbKe0UUimgi8vgVzGOTCYK2T9YibWkfVY8=; b=P5fsqvK0rNM+vSjjUpRNcqjgdfr0SO8tKbcfln4VJGX+nk5qJSDDEJUek73/olt5rt absx1j/hV72CCmV6EzK+Gwu3xJrTs8wmU/JHK8QVKRQuzMLWPMut9maKfxOyjU35AQ2J 2k3KyDLbWbQUzUj4Wpyqg9FY5JGIZkO41vQhM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707922324; x=1708527124; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=em+oQOcvRbbKe0UUimgi8vgVzGOTCYK2T9YibWkfVY8=; b=vNB9anhITXS+t4L+zpPBJKL/hpCTIrGlG/PP1VBDyCBKRyuk+nuOveNbWg3ysoyLQ7 zL5EDvdfQPg/UX2rrjTDqYVhvqp7Pk80pZIlRxZfQqZdQcLpXDxsDM9dS3Ikp/achtMZ fGo8/kht+UhLeY8/fhtHFoKmCLvC0etifPGfotMjYw/hBtYvZXMGv8TkZr63qpCjf56k IbUOhU6JeCQRMhbtOhNOPr7XIw008ADaK3KRPElQtWfoGABpRnprIYuhEj1ZcV25aFfP lrcQPwVqJse2F909rfwAaVXWsV8hevIqc1adDozC7+GMj70dYe7646pkcQ0QFyHEJ0r/ 5mAQ== X-Gm-Message-State: AOJu0Ywf1h8J7EoR56BC+lhNou0jNWr0hO3oPTSbQ/+oZC8xw5e/hDJY 4K1RYmYRulfuAlYkhWcS8SmXtX53NMatxT+kmIeaNBIT42CCbn6CN/+ygVqewB+J0l2RwcNP13w sDOReBkfilGOGuFVmJOHFPWSB0tQiqqVBJ36SaNw6 X-Google-Smtp-Source: AGHT+IFB9Si3C4d3EPWfyyB44H7kkpUEhbgkgPHe4EVLP7i9SpMPJ1/Vzbjjggr+OniJjx95A43yBOriXSHs X-Received: by 2002:a67:f796:0:b0:46d:1aec:e3e0 with SMTP id j22-20020a67f796000000b0046d1aece3e0mr2470918vso.32.1707922324096; Wed, 14 Feb 2024 06:52:04 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id f4-20020ab06f84000000b007d932cc6f50sm39440uav.9.2024.02.14.06.52.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2024 06:52:04 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Wed, 14 Feb 2024 06:52:04 -0800 (PST) Message-ID: <65ccd394.b00a0220.15850.0975SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.6] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id A91E06052712; Wed, 14 Feb 2024 09:52:03 -0500 (EST) Subject: |WARNING| pw136750 [PATCH] [v7] 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/136750 _apply patch failure_ Submitter: Gregory Etelson Date: Wednesday, February 14 2024 14:32:18 Applied on: CommitID:dccd6b7c68116a1cc044856aa35928e044640a8d Apply patch set 136750 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 (810c007e2c2bddccb46e399f612f37a770982f19) Done: main commit 810c007e2c2bddccb46e399f612f37a770982f19 Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (dccd6b7c68116a1cc044856aa35928e044640a8d) 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 app/test-pmd/testpmd.h 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 CONFLICT (content): Merge conflict in lib/ethdev/rte_flow_driver.h Auto-merging lib/ethdev/rte_flow.h CONFLICT (content): Merge conflict in 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/testpmd.h 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 (dccd6b7c68116a1cc044856aa35928e044640a8d) 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 app/test-pmd/testpmd.h 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 CONFLICT (content): Merge conflict in lib/ethdev/rte_flow_driver.h Auto-merging lib/ethdev/rte_flow.h CONFLICT (content): Merge conflict in 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/testpmd.h 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/29148/ UNH-IOL DPDK Community Lab