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 326B046EB9 for ; Wed, 10 Sep 2025 09:17:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01CA340270; Wed, 10 Sep 2025 09:17:15 +0200 (CEST) Received: from mail-pl1-f225.google.com (mail-pl1-f225.google.com [209.85.214.225]) by mails.dpdk.org (Postfix) with ESMTP id 9AA8140270 for ; Wed, 10 Sep 2025 09:17:13 +0200 (CEST) Received: by mail-pl1-f225.google.com with SMTP id d9443c01a7336-24c7848519bso66494785ad.1 for ; Wed, 10 Sep 2025 00:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1757488633; x=1758093433; 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=LAOpMdXC/NHTKt04Y5lmnCq0wN7eIgChljvGiWD5Jqs=; b=Ph5WvZL2V3im+2JYbvWClE24en+5E17ebO557I0v3/KqSBmLcoI9+QS6h7MMpV9Yx9 R6o2LUCIudrFSjFCxlNPlWnYOovqgdoAoS1agfyKqR60/EWy/P+4KCCRkOxHXXRUQcDF iwksFvnTI1pKfcPfCHrJBrCZHXMnoLxHmgkyE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757488633; x=1758093433; 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=LAOpMdXC/NHTKt04Y5lmnCq0wN7eIgChljvGiWD5Jqs=; b=lOitBDnEE2bimLPusNrPo+hrDHe7NBVX49MvXxpwqRvM2f1/bBmLxAPPvSWzVdCP8i k4VdCmuyhmoViZDL9vJSor9dATu/L10UGx/aE/MzvgALJisrP7RhIujqEBZJBDMovbEk EvhwEzNtdwynGrPmhOJaXkTo4Y/jjjhPf09T8+2ON9AVNAY4X1xefFsrZ8WLuffmJKvc Z5WVRDr/Czup97Qw+B8deed8TElATbk5EcG/wjohx7iab+V0Lr9ZadyVcL0cgR7CWgTS CMsmvnSX1aVj9PdInv0WB1laEZmGTzs99DDikdOpps3LzzQgGO9Whp8kU1SQIuADPIiq RSVg== X-Gm-Message-State: AOJu0Ywa81wAIZEu1XdDsGejT656u1V7rae7Swo2HTwAktiEgwocu6QF nIgyqDK2tiUn3MH5K9DKrJ/+efn2i7fKTWsbI1udnAx/MHjTt8hTVm+UOAFWLgrPkMmxz8DIGpj moiOHvFgMsnbgyRobZPY6mdJw1LPesYTWB/0oAy9xa0H3 X-Gm-Gg: ASbGncsVdLRfUffnECm4Y+ACE/LNSKSXVJfn2i+PqLa9OEDbIBm6GICKq4PtC0zbPa7 SB88qCkFn6bGQ5OL9mYfMg5sd2kCmDOPMpdBMaQSN8QyKOiOhQPvCBxzqJjgrY850abiZSEpPZB M7vzSOsXz1RUQii//pzsKuPlb7bJewhd2mh+x2azYAbhlvGLzDg65w1iyvwzlaN+7ZpREQzsNGz 2KQG2onjYoAfU2IBKXgJ+FsAwya5DfEvLhh7WseRRYw8SBuTfVfaT/VJKDcZ2nbTx0YZZMIicPx ujFpGQxeJd5eaL8OiEcM1plZCDlLm0sSmLKSzTvVhpze80F/r6xRdDOTZwNVdZf/1jdDSNQA X-Google-Smtp-Source: AGHT+IGdToGkRPCPQPpLszUpU6HBMB24X4x5iaVj311efix3MZXKntA+2AjZ7HokpRSJfC7HPBJXEbP613FI X-Received: by 2002:a17:902:d4ce:b0:24c:7bc6:7ad7 with SMTP id d9443c01a7336-2516ef53bb8mr208907785ad.3.1757488632187; Wed, 10 Sep 2025 00:17:12 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-25a27706b67sm1910375ad.20.2025.09.10.00.17.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Sep 2025 00:17:12 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Wed, 10 Sep 2025 00:17:12 -0700 (PDT) Message-ID: <68c125f8.170a0220.1d87be.8c33SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.21.0.2] (unknown [172.18.0.240]) by postal.iol.unh.edu (Postfix) with ESMTP id 02D276051830; Wed, 10 Sep 2025 03:17:11 -0400 (EDT) Subject: |WARNING| pw156249-156262 [PATCH] [14/14] net/xsc: update release notes for xsc PMD From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu In-Reply-To: <20250829082438.24369-15-wanry@yunsilicon.com> References: <20250829082438.24369-15-wanry@yunsilicon.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/156262 _apply patch failure_ Submitter: Renyong Wan Date: Friday, August 29 2025 08:24:40 Applied on: CommitID:f41d2db45d8a23c3315929c190d098154732a1ce Apply patch set 156249-156262 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 (f41d2db45d8a23c3315929c190d098154732a1ce) Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (027d974ef56f7312133934422ea0f8971c224603) Applying patch... Failed to apply patch: Applying: net/xsc: add FW version get support Using index info to reconstruct a base tree... M doc/guides/nics/features/xsc.ini M drivers/net/xsc/xsc_dev.c M drivers/net/xsc/xsc_dev.h M drivers/net/xsc/xsc_ethdev.c M drivers/net/xsc/xsc_vfio.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/xsc/xsc_vfio.c Auto-merging drivers/net/xsc/xsc_ethdev.c CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_ethdev.c Auto-merging drivers/net/xsc/xsc_dev.h CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_dev.h Auto-merging drivers/net/xsc/xsc_dev.c CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_dev.c Auto-merging doc/guides/nics/features/xsc.ini CONFLICT (content): Merge conflict in doc/guides/nics/features/xsc.ini error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 net/xsc: add FW version get support 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 (f41d2db45d8a23c3315929c190d098154732a1ce) Applying patch... Failed to apply patch: Applying: net/xsc: add FW version get support Using index info to reconstruct a base tree... M doc/guides/nics/features/xsc.ini M drivers/net/xsc/xsc_dev.c M drivers/net/xsc/xsc_dev.h M drivers/net/xsc/xsc_ethdev.c M drivers/net/xsc/xsc_vfio.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/xsc/xsc_vfio.c Auto-merging drivers/net/xsc/xsc_ethdev.c CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_ethdev.c Auto-merging drivers/net/xsc/xsc_dev.h CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_dev.h Auto-merging drivers/net/xsc/xsc_dev.c CONFLICT (content): Merge conflict in drivers/net/xsc/xsc_dev.c Auto-merging doc/guides/nics/features/xsc.ini CONFLICT (content): Merge conflict in doc/guides/nics/features/xsc.ini error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 net/xsc: add FW version get support 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/33987/ UNH-IOL DPDK Community Lab