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 B155243B08 for ; Tue, 13 Feb 2024 16:29:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AAECA402D8; Tue, 13 Feb 2024 16:29:15 +0100 (CET) Received: from mail-qk1-f225.google.com (mail-qk1-f225.google.com [209.85.222.225]) by mails.dpdk.org (Postfix) with ESMTP id 2AD8D40294 for ; Tue, 13 Feb 2024 16:29:14 +0100 (CET) Received: by mail-qk1-f225.google.com with SMTP id af79cd13be357-78552105081so287505885a.3 for ; Tue, 13 Feb 2024 07:29:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1707838153; x=1708442953; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=ZNBiU8JI+VEz6uUY2QD5c5snE3oLbUec2f0FzifGlGE=; b=bPpgzcrBOCtJMJvdud8KTQmoOTnn7xNR7gmSHUx5Yw9qgHLn1Ab8XF735j1yMsbc+g ML7amt+467R9X4VHA5e/xSrmg7lPbtSp/t+kt/pWvpC5yebZwBGanXckN0zZmuTXRh5K SsgrsdDlkXXVJcKIu1u4C971LlmrOoqwECBhU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707838153; x=1708442953; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZNBiU8JI+VEz6uUY2QD5c5snE3oLbUec2f0FzifGlGE=; b=gzKCBTcIRaxGb+EHtuyr8rcRtGfsC3JINoF40SN8F8fjlU9JSA/CGZ60/6K/2565a0 ZuvuxUX/+Lrw7yrnsBbNBa9355Oonn3kqV5yuPNfupQgpzGXhf9OyYbNr9RRiZg57TeB 8ybs14KC6I6wVsGGPezk/Dq7TRcxaCvkHM5NN3EfF0Pupu8YP6igkviIM1MjB6i4qzec XqTBKWuIYYim3Jhtm40GPIobavwHFeiYysfgjw2yc9U75gg645UHBGaUMw5Roz+mQWSC 8x7iC3S8C7T1Byol0z5nHOaFl1sE9o/JHs+6wGzMXOHk/8ZflZwkaKRFa83+58r129Uw iRYw== X-Gm-Message-State: AOJu0Yyt9NW9TkCOkthzfN1S3/mzXI6SbrXH1r2P6+sc+vDcP2tvDoaf hqFgT/aRlktOU7ccBVecOo7gMcC42/BrhRKQkdonPvsA2Ecwet4Ed/izMZKoqPqVqF+Ofo4d9g9 sU5T4EgHU+i1UV29aTBMgSwTWq2ntnFgGQlt1QyvtHNLEXeELMv7Gu8zk X-Google-Smtp-Source: AGHT+IEfJXg/dE6N2eis180o/4fCR4QPft1y+K7yK24H/Pnv0B7OYnN/zDKoZtJdUI44vYdMx2tvJsbPHg8k X-Received: by 2002:a05:620a:4887:b0:787:253c:63ee with SMTP id ea7-20020a05620a488700b00787253c63eemr682335qkb.4.1707838153576; Tue, 13 Feb 2024 07:29:13 -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 bm24-20020a05620a199800b007871f9b580bsm27772qkb.0.2024.02.13.07.29.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2024 07:29:13 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Tue, 13 Feb 2024 07:29:13 -0800 (PST) Message-ID: <65cb8ac9.050a0220.297c4.1308SMTPIN_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 38FCF605250F; Tue, 13 Feb 2024 10:29:13 -0500 (EST) Subject: |WARNING| pw136641-136644 [PATCH] [v4, 4/4] app/testpmd: add encap hash calculation 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/136641 _apply patch failure_ Submitter: Ori Kam Date: Tuesday, February 13 2024 14:16:40 Applied on: CommitID:4cf59bbc9edf5419a9f2644a132c9a96c071a4c8 Apply patch set 136641-136644 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 (31d72ff4dc7c057366153e9918ac92bf9123a3bc) Done: main commit 31d72ff4dc7c057366153e9918ac92bf9123a3bc Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (4cf59bbc9edf5419a9f2644a132c9a96c071a4c8) Applying patch... Failed to apply patch: Applying: ethdev: introduce encap hash calculation Using index info to reconstruct a base tree... M doc/guides/rel_notes/release_24_03.rst M lib/ethdev/rte_flow.c 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 Auto-merging lib/ethdev/rte_flow_driver.h Auto-merging lib/ethdev/rte_flow.c CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c Auto-merging doc/guides/rel_notes/release_24_03.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 ethdev: introduce encap hash calculation 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 (4cf59bbc9edf5419a9f2644a132c9a96c071a4c8) Applying patch... Failed to apply patch: Applying: ethdev: introduce encap hash calculation Using index info to reconstruct a base tree... M doc/guides/rel_notes/release_24_03.rst M lib/ethdev/rte_flow.c 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 Auto-merging lib/ethdev/rte_flow_driver.h Auto-merging lib/ethdev/rte_flow.c CONFLICT (content): Merge conflict in lib/ethdev/rte_flow.c Auto-merging doc/guides/rel_notes/release_24_03.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 ethdev: introduce encap hash calculation 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/29132/ UNH-IOL DPDK Community Lab