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 922C5464CC for ; Mon, 31 Mar 2025 23:52:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6528840A6F; Mon, 31 Mar 2025 23:52:42 +0200 (CEST) Received: from mail-il1-f225.google.com (mail-il1-f225.google.com [209.85.166.225]) by mails.dpdk.org (Postfix) with ESMTP id 8389740A6C for ; Mon, 31 Mar 2025 23:52:40 +0200 (CEST) Received: by mail-il1-f225.google.com with SMTP id e9e14a558f8ab-3d442a77a03so13347955ab.1 for ; Mon, 31 Mar 2025 14:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1743457960; x=1744062760; darn=dpdk.org; h=references:in-reply-to:cc:to:from:subject:message-id:date:from:to :cc:subject:date:message-id:reply-to; bh=wsJ/3vlKPXxql07CbhUdLR9DDPssACs7E7QdFrsX/dM=; b=hq+zRa6kVY+admzdLFmm1F9LGnH2dctWM74eLFmHoyBPbWtcOY+E7zu8p/i0g/+1Iy O46X4IhPRhbONb/wDlhYswGNhZU5jgELqc4okP3exchNgJR9ahIxJXOsdbedHihHagaD VoXls+NnuW42zZHinZ+O5ZW7qm4sc3fIjngTE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743457960; x=1744062760; h=references:in-reply-to:cc:to:from:subject:message-id:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wsJ/3vlKPXxql07CbhUdLR9DDPssACs7E7QdFrsX/dM=; b=XsUGoCLQdwcGYtGXVp/T8895QL0UR9nA9klEuL3qPjubVGe1VX6JHX3h2fp25DIpAQ L27cY8r5rF6e+ZNsnbBP579EvS0D1K2NBUA5JupZ9fIP8EADXBEePfX7bzq4lCM6unho OY95aDa/Bm8JDoQ0P7xTwKhrwSk1H1CJF1b0KrBVuQm0r+H8p9wkWOtcE+Aenks+HNdx iSuA0qLlFRwiqF6faTTB961d4YG7ThGSMgfk0ITAyGDh6YsZjflOfkpS4Ua+fxjKZBtZ 9KDyfMF2fkWztYDr5x6bA3xexv2jULnWj843mlB5scUQYRPegIFZqnZIg/sm01O/umRU kqJg== X-Gm-Message-State: AOJu0YzgurWAE23eEud7NrLZV9sX0quLmEzcZESIO2QKS1L1GSdRkOH2 5oJS4wUr8hCqRhpqe33puoqQWtmBczyN+j7nYrQ9FUhg1mlzHbmkm5yef32WqgbfveSQD4Fzsll aM4wRtHP37aHenxpjo4CtWsxEmuJzCjdcJWSYSdsMAod82deuNSe5wklJ X-Gm-Gg: ASbGnctMQQx4AJT3zdiEl1Q58vCQWD8vImWQFGBcjP/LuO8ab242dOT2UbuFwpsGFvv RloYaLlOB3zkBycL2guVqgM/jzXajRPShVL62lM8EQ5+2IxM1gaLGzke3aQJDZnp/5TPeNckLv5 BMZUrVvuEsyNk39I/oBl6j4bwJ8mU6fVZDam2daTi6VuVi6s6h7vO/9DnOL/+tp3wMSWp/8pWi/ x8BfXQP/5g5iHHnYPCT75sqn4qNXlE9IzJVL2vGxsWs72gdoG5HccBHXlEVxoMBWim6Wj7U45jS aa/ZXhKnTOAW9Q+XWmyDeGil/YcXTF3LdyysDKV83syODHoDQhPJ X-Google-Smtp-Source: AGHT+IG0M0xI66/lCcKnwuqdnsmiIB6t8pDuOJDnku3YlDCE+61d643kUh4bxIVl2KSpR02kn/NDc68OY/R/ X-Received: by 2002:a05:6e02:1a4e:b0:3d3:f27a:9103 with SMTP id e9e14a558f8ab-3d5e08eb2bbmr94154555ab.1.1743457959709; Mon, 31 Mar 2025 14:52:39 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [2606:4100:3880:1234::84]) by smtp-relay.gmail.com with ESMTPS id 8926c6da1cb9f-4f4971bf845sm52377173.9.2025.03.31.14.52.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Mar 2025 14:52:39 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Mon, 31 Mar 2025 14:52:39 -0700 (PDT) Message-ID: <67eb0ea7.050a0220.1ba11e.2cb9SMTPIN_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 EC0BD6052471; Mon, 31 Mar 2025 17:52:38 -0400 (EDT) Subject: |WARNING| pw152698 [PATCH] doc: reword flow offload and api docs From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu In-Reply-To: <20250331214036.17295-1-nandinipersad361@gmail.com> References: <20250331214036.17295-1-nandinipersad361@gmail.com> 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/152698 _apply patch failure_ Submitter: Nandini Persad Date: Monday, March 31 2025 21:40:36 Applied on: CommitID:edd3f4b1265e6da707c46ca9b6c39d332647baea Apply patch set 152698 failed: Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3) Trying to checkout branch: origin/main Checked out to main (edd3f4b1265e6da707c46ca9b6c39d332647baea) Done: main commit edd3f4b1265e6da707c46ca9b6c39d332647baea Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (f3cb237103aada7bc83fd3f40929fb6fb3e58c3b) Applying patch... Failed to apply patch: Applying: doc: reword flow offload and api docs Using index info to reconstruct a base tree... M doc/guides/prog_guide/ethdev/flow_offload.rst Falling back to patching base and 3-way merge... Auto-merging doc/guides/prog_guide/ethdev/flow_offload.rst CONFLICT (content): Merge conflict in doc/guides/prog_guide/ethdev/flow_offload.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 doc: reword flow offload and api docs 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: origin/main Checked out to main (edd3f4b1265e6da707c46ca9b6c39d332647baea) Applying patch... Failed to apply patch: Applying: doc: reword flow offload and api docs Using index info to reconstruct a base tree... M doc/guides/prog_guide/ethdev/flow_offload.rst Falling back to patching base and 3-way merge... Auto-merging doc/guides/prog_guide/ethdev/flow_offload.rst CONFLICT (content): Merge conflict in doc/guides/prog_guide/ethdev/flow_offload.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 doc: reword flow offload and api docs 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/32916/ UNH-IOL DPDK Community Lab