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 7E30043C0C for ; Fri, 1 Mar 2024 17:06:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 79A3C402E0; Fri, 1 Mar 2024 17:06:23 +0100 (CET) Received: from mail-yb1-f225.google.com (mail-yb1-f225.google.com [209.85.219.225]) by mails.dpdk.org (Postfix) with ESMTP id 4BC4A4026C for ; Fri, 1 Mar 2024 17:06:22 +0100 (CET) Received: by mail-yb1-f225.google.com with SMTP id 3f1490d57ef6-dcc80d6004bso2222958276.0 for ; Fri, 01 Mar 2024 08:06:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1709309181; x=1709913981; 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=JMxPC6iGn/Qpb6u9xCi6sA5h0pyuhiKtapJZRicwbjI=; b=iHf4VdxBNFochXOELSPNYyjgEzzOSCnU9Zy1nvGNwCVfMv3/Zu/4pfKDS9VULnB05w CnrOB5HhsFZbYlJFrOSSm3F8/C8NaQycyfZTwlVuVp6kdCHLa2GGxuPYEBJdB5/lbkk+ IZyT0S0XH+B1yl5x9bF+Xru/P8g7/2blBPBXs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709309181; x=1709913981; 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=JMxPC6iGn/Qpb6u9xCi6sA5h0pyuhiKtapJZRicwbjI=; b=dhv8HSrmmxpPA31evYcKFSXZR4vzdPmVCuCt/ZsXViMkRAbFGrZOcX3RKOXVLtrgQW VXWDen4pyVLfnQXSXCxmgFZQfJIFTnpvdva76FXZreabuAk9Z+5vCxpd8XRcvDhoRAv7 efutTDIWIraYi5bDjJkabcZ9+gJXtWO1Qbv+d2gfIp3SrSqkQTNgyHBNNXOp7+fn7KPr ANKvNpTfH6CTIh5LbBkvUIvqQJqEfTzahNVaL9IoDBCDVd/BlNbCf8VfRGM0OhDw4MKO lROePTTUvFpKbq9kY9cuMqYQysiZKc2efmaT8Na/TYAkbLP2/GjFLQUOQFQ/MDqPC8fg tc7g== X-Gm-Message-State: AOJu0Yx+wQXph/BeI+57oLwtLs3ku+EhX+X/yp6rnJswwA7gOtE4ZtVN Fyj8I1CdZzaI3Rmr27HhMiGp0If+H68KE91jKXDHZcxy4V+RhYAjVKCfaEolqTp2u+WyYXGBVkI WNmti3kDNXLy5wb3ZIZPOE6BhMFa8W56LpoXFckGA X-Google-Smtp-Source: AGHT+IHucX1k5JaQEhwCq6GF35kA2bBeLsJWI3ETIv1X01FxMPReEQ5tyf1wIodC6my8Oz0pGbC7KKumr64s X-Received: by 2002:a25:bc45:0:b0:dce:1285:e9a5 with SMTP id d5-20020a25bc45000000b00dce1285e9a5mr2151978ybk.11.1709309181666; Fri, 01 Mar 2024 08:06:21 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id j129-20020a256e87000000b00dc6df29580bsm203425ybc.14.2024.03.01.08.06.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2024 08:06:21 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Fri, 01 Mar 2024 08:06:21 -0800 (PST) Message-ID: <65e1fcfd.250a0220.1004e.d8bfSMTPIN_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 3993B6052712; Fri, 1 Mar 2024 11:06:21 -0500 (EST) Subject: |WARNING| pw137651 [PATCH] net/mlx5: fix VID assignment in VLAN modify From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu In-Reply-To: <20240301060448.88350-1-getelson@nvidia.com> References: <20240301060448.88350-1-getelson@nvidia.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/137651 _apply patch failure_ Submitter: Gregory Etelson Date: Friday, March 01 2024 06:04:48 Applied on: CommitID:387aefe9fab8f1033071659a758ccda61a220ffd Apply patch set 137651 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 (5df34de5808a7b826b8bc035d6ee3161a12be364) Done: main commit 5df34de5808a7b826b8bc035d6ee3161a12be364 Trying to checkout branch: origin/next-net-mlx-for-next-net Checked out to next-net-mlx-for-next-net (387aefe9fab8f1033071659a758ccda61a220ffd) Applying patch... Failed to apply patch: Applying: net/mlx5: fix VID assignment in VLAN modify Using index info to reconstruct a base tree... M drivers/net/mlx5/mlx5_flow_hw.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/mlx5/mlx5_flow_hw.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_hw.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 net/mlx5: fix VID assignment in VLAN modify 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 (387aefe9fab8f1033071659a758ccda61a220ffd) Applying patch... Failed to apply patch: Applying: net/mlx5: fix VID assignment in VLAN modify Using index info to reconstruct a base tree... M drivers/net/mlx5/mlx5_flow_hw.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/mlx5/mlx5_flow_hw.c CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_hw.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 net/mlx5: fix VID assignment in VLAN modify 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/29359/ UNH-IOL DPDK Community Lab