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 827D04655E for ; Fri, 11 Apr 2025 09:50:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D4E7406B4; Fri, 11 Apr 2025 09:50:42 +0200 (CEST) Received: from mail-io1-f99.google.com (mail-io1-f99.google.com [209.85.166.99]) by mails.dpdk.org (Postfix) with ESMTP id 3DE5140285 for ; Fri, 11 Apr 2025 09:50:41 +0200 (CEST) Received: by mail-io1-f99.google.com with SMTP id ca18e2360f4ac-85da5a3667bso50424939f.1 for ; Fri, 11 Apr 2025 00:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1744357840; x=1744962640; 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=2WkToUygmRT0aAD6TykUybNBIBePbVzaR9DjrQzHldI=; b=TrZnMIbPJsOaGYCx4585xFOoy6dJpXdBJEZCG//uCS+W7vSIMvZKCC4tYkaCvUP4Lx /h/DAK6G5497IhQ1JrZUw3IlfV09FfaOWXt6qes5I9Eh9x6QycnSVY2qsclcXtvdwkzj U9Ax1xIkY76x+pYxWhOPCO5WBhSTyeC6N4T7I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744357840; x=1744962640; 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=2WkToUygmRT0aAD6TykUybNBIBePbVzaR9DjrQzHldI=; b=lRSHfzkQizyMeend0nQS26GSkShuugRvobAkingu6prQ15dqXQQIknunGDcSdTNMm7 h2A4mSXB1pbJyuaG2wMQhOBDI/V81X38QyEtnqMVZeTJMLTGTlqLfAXdZTuUNWX2HY07 R8x9E887ozHz7oEBrFPl7DC6otl425jXcA+Yqa2CcbrX6dNPxKqR5ugRc7iii/pVSQkW wWtt+T+CPyT8/0ljKK9vjrVSniP5jFt21HKSIIUVUGIb1mlJYtcx4lbuwLI2su/C71wX R8pu1O3zkTJTv4SC8wFrm/2plweZ6WAEElGO1d/8BOPAf7GCaR0QIF7uHssL+DebEy2Z okAg== X-Gm-Message-State: AOJu0Yz1UhxV9pvh7e/urSHFanJJD8w6BovJALxd56aM1BE0McT59BHm VB/NiQCC9twC4ZMDNgUcrjh3ZfIjt+8NLloZPF1oGhI5A8sHZBlfEvAeoDqaZ/L67Jx68N/9K3X 51jYMsXINbI7O8SoDoIZhl73smYLLjeb8dsCI2dHh X-Gm-Gg: ASbGnctZYVpRDwsaJMg8yTMvUU0qzDdLl+mzb4WvadMdx0gPKbuEVWUhzfcE8WKZY2X zsjuagRBLNbKMQyKxp73pc4seILZd4OT83TQ3LQ9RtFcTl0WBBKVX4KhGVRlIQRln6leLwdC1Di w9h3ArMSWZXl8EvgyPGqEbJkQepMj4YUaM5AFjh5tGLbNu4Mne0EnOg2yjT7ft2/+aJBzoT+fVp N9oRTC1Dfxxq+TZUC5LxbKBv4eSooPLgC0NKijCJoIfO/6aNh+wLbjV5eqgdOgcUTeBCjDIMrsc DgBcgaWe46ywKi0Mf1nYqSswIgOmHPhHNYFn X-Google-Smtp-Source: AGHT+IH8nzZRbzTiOMLObiqWJQ9dYNVJg4NCZ2RPL0aX58Llp0pVpXJIi4guFVNvbfSqFgXJhNWuVdbHHcXF X-Received: by 2002:a92:c245:0:b0:3d5:be65:34ac with SMTP id e9e14a558f8ab-3d7ec1dd513mr17740545ab.2.1744357840494; Fri, 11 Apr 2025 00:50:40 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id e9e14a558f8ab-3d7dbaa4124sm3791895ab.36.2025.04.11.00.50.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Apr 2025 00:50:40 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Fri, 11 Apr 2025 00:50:40 -0700 (PDT) Message-ID: <67f8c9d0.050a0220.d8edc.ee83SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.21.0.6] (unknown [172.18.0.240]) by postal.iol.unh.edu (Postfix) with ESMTP id DDAFF6052471; Fri, 11 Apr 2025 03:50:39 -0400 (EDT) Subject: |WARNING| pw152873 [PATCH] [v2] 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: <20250410183931.40881-1-nandinipersad361@gmail.com> References: <20250410183931.40881-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/152873 _apply patch failure_ Submitter: Nandini Persad Date: Thursday, April 10 2025 18:39:31 Applied on: CommitID:ca1690ebd224f148268285b15b97441ccdbdd07e Apply patch set 152873 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 (ca1690ebd224f148268285b15b97441ccdbdd07e) Done: main commit ca1690ebd224f148268285b15b97441ccdbdd07e Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (b69fb7abb6d211cb74284029c6cdb2066b9ac0e9) 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 (ca1690ebd224f148268285b15b97441ccdbdd07e) 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/32991/ UNH-IOL DPDK Community Lab