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 7CC7E43AD8 for ; Tue, 13 Feb 2024 15:03:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 78C3240647; Tue, 13 Feb 2024 15:03:48 +0100 (CET) Received: from mail-qv1-f97.google.com (mail-qv1-f97.google.com [209.85.219.97]) by mails.dpdk.org (Postfix) with ESMTP id 8C25640294 for ; Tue, 13 Feb 2024 15:03:47 +0100 (CET) Received: by mail-qv1-f97.google.com with SMTP id 6a1803df08f44-6869e87c8d8so19434346d6.2 for ; Tue, 13 Feb 2024 06:03:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1707833027; x=1708437827; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=TXUZWn2804KvtSlc09qmwmzbOhsXPiFDgZnRNF7wlIs=; b=JtEtOkcNtxMMPCZk5dQJ4oC8R03FkPG3ckPXvIBCGQJkdi1wQjZohnUAqYBvnLt9xx 8hfg8yDaV8DL9klVIQMdFtQBDFDQcHJwjNiOHmWPU3c3PqQhgDW2Jh/GUjjcYzJn/NqY 9X9B56dPHFK4f1tL00aPZt6Qg1+w00FYHL+PM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707833027; x=1708437827; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TXUZWn2804KvtSlc09qmwmzbOhsXPiFDgZnRNF7wlIs=; b=aLb2twLe+DL44NG7TUunAZPv+X/aeoTVCAL6LAxEzNj/TEJX+K/ssD7NqEQtQhZqEo 2l8aPeKqsM/1bb0+VeAI8X5GocmcJRjn9vLUjcssG6bFYmqhQ6NXgWOPRgSJS8AoLCDc w4l7WrvUSwHy2X7EIeHYjRAIJ6OW6GUPv0SDfCTbcL8YnUf57OQGQtagnTfGOZwZkmq3 kQAe0wEcbCGKeDsSMLUUcUdooqtyFuyADFER2COiG+5ZhYr9wsWJMR20UrNTT8aVOZZs 9wz6iL4LVB5WBCsgK0MP+ETSzl96x+fzwxV8vcHoEGWzhx5oWgvnvzV/m8+EXkC7ychJ ahBA== X-Gm-Message-State: AOJu0YzkpCBeb/H6kxWRBp9Wh/iSCnqMzn50Z9DNLEeC+HJanL5iLfQC ESDd1hQF51ucl61eKLTea0w1pV3pxH3Kuoo4XHlFrnlPWUYst81al6A4433jjRxx/tC9UI9iijd evSmCXpbNsLmtZEoI7ER9BvAD7dqTDUlPtvCJTaqMm7fGVROTtM1aNfwk X-Google-Smtp-Source: AGHT+IFiwfm1jICY3caQtT0ByRCCX79Al+91SqqXfS/q33+/wVZpbupHapHU5HK+f7/Vv4he29+NzBfUuyZv X-Received: by 2002:ad4:5ce7:0:b0:68e:faa6:6b59 with SMTP id iv7-20020ad45ce7000000b0068efaa66b59mr199592qvb.58.1707833026937; Tue, 13 Feb 2024 06:03:46 -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 eh20-20020a056214187400b0068c95c8d9b8sm147497qvb.45.2024.02.13.06.03.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2024 06:03:46 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Tue, 13 Feb 2024 06:03:46 -0800 (PST) Message-ID: <65cb76c2.050a0220.8045c.8c58SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.21.0.5] (unknown [172.18.0.240]) by postal.iol.unh.edu (Postfix) with ESMTP id 9A8436052510; Tue, 13 Feb 2024 09:03:46 -0500 (EST) Subject: |WARNING| pw136637-136640 [PATCH] [v3, 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/136637 _apply patch failure_ Submitter: Ori Kam Date: Tuesday, February 13 2024 13:48:33 Applied on: CommitID:7c75d453b719989092e0a53f0c049dc6c247bec0 Apply patch set 136637-136640 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 (74fff67a34a33c8e6565cfbcb5618c268eb388c6) Done: main commit 74fff67a34a33c8e6565cfbcb5618c268eb388c6 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: 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 (7c75d453b719989092e0a53f0c049dc6c247bec0) 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/29131/ UNH-IOL DPDK Community Lab