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 27FBD4387B for ; Wed, 10 Jan 2024 03:59:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0335740298; Wed, 10 Jan 2024 03:59:51 +0100 (CET) Received: from mail-pl1-f226.google.com (mail-pl1-f226.google.com [209.85.214.226]) by mails.dpdk.org (Postfix) with ESMTP id 136FE40269 for ; Wed, 10 Jan 2024 03:59:50 +0100 (CET) Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-1d4a980fdedso33312965ad.1 for ; Tue, 09 Jan 2024 18:59:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1704855589; x=1705460389; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=fOHsSxOsmc3dmIdAFW84nZ9FS/gWzh0o26awgcT9FMs=; b=RlNW+Yiwrwqcn1AfMP9eY7NELuy5yu6ieAegFWZZSNsnrNCpzq+VdJZagCkBLwrd0w 5MYmOpt4Lf0TcB1OzCs7oSlGNcnTmtLQIfikkhu2okmkPw6IS9kCnLxBrn4obp56LywV T/tNX/GArw2TS9DLlazgLc/9+cPGNy//G24G8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704855589; x=1705460389; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fOHsSxOsmc3dmIdAFW84nZ9FS/gWzh0o26awgcT9FMs=; b=KBNqqGY/IAqgth5UPZs8R4jTR55Q5eYwFKxe0iZQ6EOnuXV1oO960pfir4Iqmb5YpE 8SXgW8DBV3Nljhhibx5EMBeTAa2Nj5dcXkAN/p/4UXzUvk5Wn5fbDr3RI/8XAZkwwHDc Ljdn40v5JGoFjprbFbsMdlcloDS9KB1r3iaGk28OAGvoPBoO1sH445XV9dkKZf83TQNl SB01Z/5w23R1HeUMB0wB583tOw7hM9aHV4pEIySlan1h1u0WYev7ucX17k1zritEXsYa 9K6Yf39F6bScB+ZDNvPGi0tiU2qV4MCMrDP5S27pt0m5BrmoWfjej50cM8z/Zi5R0kbi AvCA== X-Gm-Message-State: AOJu0YwlMCtunwEWZu/GGvuhST3HxlHUaaNIgOd6zxhCuOiz2HLBt83o /5bxdFJQnXhwg8w4QlWq8WCkfzR5iM80sAC0E95Ej17YSVegYHxrL9T2Esv824Y5Yw== X-Google-Smtp-Source: AGHT+IFmMW4kWs6KKL2m7byqU7dJ4HaxIxYAuEY9UInCsg8sJOeMv3DvGVITQm4a98jZAyjo0C1smhRhwHA2 X-Received: by 2002:a17:902:da83:b0:1d3:c942:144c with SMTP id j3-20020a170902da8300b001d3c942144cmr502133plx.80.1704855589285; Tue, 09 Jan 2024 18:59:49 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id o12-20020a1709026b0c00b001d08a1e7710sm105568plk.59.2024.01.09.18.59.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2024 18:59:49 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Tue, 09 Jan 2024 18:59:49 -0800 (PST) Message-ID: <659e0825.170a0220.f7baa.719fSMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.2] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id BF5AD6052516; Tue, 9 Jan 2024 21:59:48 -0500 (EST) Subject: |WARNING| pw135820 [PATCH] [v11] net/iavf: add diagnostic support in TX path 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/135820 _apply patch failure_ Submitter: Mingjin Ye Date: Wednesday, January 10 2024 02:25:55 Applied on: CommitID:6ef07151aac4b4d9601d547f94a996d1c71b3871 Apply patch set 135820 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 v23.11-44-g6ef0715 Done: main commit 6ef07151aac4b4d9601d547f94a996d1c71b3871 Applying patch... Failed to apply patch: Applying: net/iavf: add diagnostic support in TX path Using index info to reconstruct a base tree... M doc/guides/nics/intel_vf.rst M drivers/net/iavf/iavf.h M drivers/net/iavf/iavf_ethdev.c M drivers/net/iavf/iavf_rxtx.c M drivers/net/iavf/iavf_rxtx.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/iavf/iavf_rxtx.h Auto-merging drivers/net/iavf/iavf_rxtx.c CONFLICT (content): Merge conflict in drivers/net/iavf/iavf_rxtx.c Auto-merging drivers/net/iavf/iavf_ethdev.c Auto-merging drivers/net/iavf/iavf.h CONFLICT (content): Merge conflict in drivers/net/iavf/iavf.h Auto-merging doc/guides/nics/intel_vf.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 net/iavf: add diagnostic support in TX path 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 v23.11-44-g6ef0715 Applying patch... Failed to apply patch: Applying: net/iavf: add diagnostic support in TX path Using index info to reconstruct a base tree... M doc/guides/nics/intel_vf.rst M drivers/net/iavf/iavf.h M drivers/net/iavf/iavf_ethdev.c M drivers/net/iavf/iavf_rxtx.c M drivers/net/iavf/iavf_rxtx.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/iavf/iavf_rxtx.h Auto-merging drivers/net/iavf/iavf_rxtx.c CONFLICT (content): Merge conflict in drivers/net/iavf/iavf_rxtx.c Auto-merging drivers/net/iavf/iavf_ethdev.c Auto-merging drivers/net/iavf/iavf.h CONFLICT (content): Merge conflict in drivers/net/iavf/iavf.h Auto-merging doc/guides/nics/intel_vf.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 net/iavf: add diagnostic support in TX path 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/28839/ UNH-IOL DPDK Community Lab