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 E01B543B86 for ; Tue, 5 Mar 2024 11:46:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DABBC40271; Tue, 5 Mar 2024 11:46:35 +0100 (CET) Received: from mail-yw1-f226.google.com (mail-yw1-f226.google.com [209.85.128.226]) by mails.dpdk.org (Postfix) with ESMTP id 425E54026B for ; Tue, 5 Mar 2024 11:46:34 +0100 (CET) Received: by mail-yw1-f226.google.com with SMTP id 00721157ae682-60974cb1cd7so48500767b3.3 for ; Tue, 05 Mar 2024 02:46:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1709635593; x=1710240393; 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=KBm/oPszjTQ8I6IJxOcNHafHQqN8c5Z6PYB2iXuLMr0=; b=VfUAC5vRIBW38nNgLtgir4jkpl659Geak47715ZskOxGxJy7DOjKhNDoHbWWiBTzz/ ySs8ZrQnpCs4JEAS/QWoCDc/Fa/+ZlZQQ6FCP1i0PD9/48edvf5Og5BfGg+8LhR8jUlY By0AH0hYcdI854vifT3SmO1Z8cEupNjpAQsvQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709635593; x=1710240393; 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=KBm/oPszjTQ8I6IJxOcNHafHQqN8c5Z6PYB2iXuLMr0=; b=bZ1dqq8O5xarSIf+4G9VeJjsPPUan3IYHrkokfwR5XbPsc5Tv0KkHmUyF86ISFM2wc Ti+gMFX0DgRSNzgCl7/+9SP4vrZvPmPQSScH/K2B8a1v/a4qN8FLxzFcTp5QLXhirxeh Ho9mz4WM1C6s2Y0n+eOkZlYfiSWdcV9Ft6jCMUYSJMo342Lh61ycUEcRn7oK/2KUchWP yMy2ZW1Hvp9S2zLCqm3YP3Gdy2lhP9tNeNRn1hU2SjpVP1x1WLe8LhQGIOehGpOM4Z+T bXfCulsJlFpfqErLXO28PiiZGKGPCvyqXz472Na1Ok+Oid0zNyCauVKHFFWfd59T1S71 XuTA== X-Gm-Message-State: AOJu0YzxYB7+UOwNm5ewQ2jq/oaaTp/ZoLA+pTSv9MlR50PhX4TorDNL yFC/muZ83TEpsfo90sI7QoRCv/Fo6FDs2XjwGfYsap7rrFtkZnNVwER71csG2u4XxZ5yRS5vOq/ jbWzqE7uuF0C/55YJI1JaaYoRU05PE3G9a7RKd3+s X-Google-Smtp-Source: AGHT+IHKgO54x17psDTeoeCsIvvvTV8BmXSAOJ3pUFjzhFNjh42c7gcxQJCbvBlJ6kURGE7K8ryX9MxMjLaG X-Received: by 2002:a81:47d4:0:b0:608:597b:bca with SMTP id u203-20020a8147d4000000b00608597b0bcamr12194023ywa.36.1709635593743; Tue, 05 Mar 2024 02:46:33 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id p69-20020a0de648000000b006097ecd1087sm582368ywe.3.2024.03.05.02.46.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2024 02:46:33 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Tue, 05 Mar 2024 02:46:33 -0800 (PST) Message-ID: <65e6f809.0d0a0220.39d88.6a61SMTPIN_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 61DB96052712; Tue, 5 Mar 2024 05:46:33 -0500 (EST) Subject: |WARNING| pw137984 [PATCH] vhost: fix vring addr update with vDPA From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu In-Reply-To: <20240305091326.2697724-1-david.marchand@redhat.com> References: <20240305091326.2697724-1-david.marchand@redhat.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/137984 _apply patch failure_ Submitter: David Marchand Date: Tuesday, March 05 2024 09:13:25 Applied on: CommitID:92c0ad70caf3ed6f4b93de6ddaf7bc369737c049 Apply patch set 137984 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 (deedfb86a7a6e10064d3cccd593f62072de96e36) Done: main commit deedfb86a7a6e10064d3cccd593f62072de96e36 Trying to checkout branch: origin/next-virtio-for-next-net Checked out to next-virtio-for-next-net (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049) Applying patch... Failed to apply patch: Applying: vhost: fix vring addr update with vDPA Using index info to reconstruct a base tree... M lib/vhost/vhost_user.c Falling back to patching base and 3-way merge... Auto-merging lib/vhost/vhost_user.c CONFLICT (content): Merge conflict in lib/vhost/vhost_user.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 vhost: fix vring addr update with vDPA 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 (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049) Applying patch... Failed to apply patch: Applying: vhost: fix vring addr update with vDPA Using index info to reconstruct a base tree... M lib/vhost/vhost_user.c Falling back to patching base and 3-way merge... Auto-merging lib/vhost/vhost_user.c CONFLICT (content): Merge conflict in lib/vhost/vhost_user.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 vhost: fix vring addr update with vDPA 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/29412/ UNH-IOL DPDK Community Lab