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 3C97E4383E for ; Fri, 5 Jan 2024 17:09:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1305B402D8; Fri, 5 Jan 2024 17:09:51 +0100 (CET) Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) by mails.dpdk.org (Postfix) with ESMTP id ADBB6402CC for ; Fri, 5 Jan 2024 17:09:49 +0100 (CET) Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-1d40eec5e12so12197615ad.1 for ; Fri, 05 Jan 2024 08:09:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1704470989; x=1705075789; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=RguXFsoDWuO3/BGniq91MnG+ZyoOZgPDtVOlTMVJAFk=; b=BZsga1Pq0BTJQwwV7XPawf+IO5Sr18FatXzLgPZ2tbsbetuwMHObtnGWUgrnwy3Hxy 71G85kSskhTXP+ymdUh8TxN9nM+RVaNJcQ7o5vTrCvwniMOn78mCrt1pArgIQJdAs/zO 9TTCSFXRN+Va+UFFBD7pbRyxZLh2neR+eT1bY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704470989; x=1705075789; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RguXFsoDWuO3/BGniq91MnG+ZyoOZgPDtVOlTMVJAFk=; b=Fz04LB8IQ1HbouGg5tO9j1qLa+omQbtG+hxW3rUQBGqm2iUrlVb2b5aMEaPW2IuP/K jXa4KKO3yZlazeTUays7FzOXob4g9IsqHU9EQd7Iw35DvXNaQExCy3uQX0YNzDdOOfsv DwVCHZZ+KJpyH518oxu6rz/j0as9OTKhM86CYA+Nwbz68sbJOBcrI7fX5LaxvMHHSQgz oYmPvDBYK9/l2ETSRZAzQNmsW3BQoQMHOOqkNdtFcu2GOxGMuUTLICUyo2K0cVOZQJDk kZ/VAwU2j3MURTTQlK9aoHl9l0RabzRWU5BJLNaSiFbDoi+qkP1qnZaTi+TD0KpMjkDw 19dg== X-Gm-Message-State: AOJu0YyFN3aag/siikamP1AqP1k4GtegpslXzZl/poOAO0Tavd0ykd6I NG+KgAbo3ue5U1q5OhWvUoTUOachGSNxyeZOP0YZnJXAsCFjL3hBB1FVw+NS78ZaaFpZQDmmRG0 42+HRlQ== X-Google-Smtp-Source: AGHT+IEf76Coz8f0YgpsJFpDJgNiR+8C1xwNaT5Ci0Gksbqs+fhl2FvyMn2MfFqjCMeAPJpfs9mx/qajechQ X-Received: by 2002:a17:902:7582:b0:1d4:e276:61c1 with SMTP id j2-20020a170902758200b001d4e27661c1mr1740164pll.105.1704470988786; Fri, 05 Jan 2024 08:09:48 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [2606:4100:3880:1234::84]) by smtp-relay.gmail.com with ESMTPS id g7-20020a1709029f8700b001d4638f4001sm13920plq.148.2024.01.05.08.09.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2024 08:09:48 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Fri, 05 Jan 2024 08:09:48 -0800 (PST) Message-ID: <659829cc.170a0220.c2c07.103bSMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.3] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id 06257605C311; Fri, 5 Jan 2024 11:09:48 -0500 (EST) Subject: |WARNING| pw135758-135760 [PATCH] [v3, 3/3] doc: update ice document for qos 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/135758 _apply patch failure_ Submitter: Zhang, Qi Z Date: Friday, January 05 2024 21:12:37 Applied on: CommitID:6ef07151aac4b4d9601d547f94a996d1c71b3871 Apply patch set 135758-135760 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/ice: hide port and TC layer in Tx sched tree Using index info to reconstruct a base tree... M drivers/net/ice/ice_ethdev.h M drivers/net/ice/ice_tm.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/ice/ice_tm.c CONFLICT (content): Merge conflict in drivers/net/ice/ice_tm.c Auto-merging drivers/net/ice/ice_ethdev.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 net/ice: hide port and TC layer in Tx sched tree 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/ice: hide port and TC layer in Tx sched tree Using index info to reconstruct a base tree... M drivers/net/ice/ice_ethdev.h M drivers/net/ice/ice_tm.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/ice/ice_tm.c CONFLICT (content): Merge conflict in drivers/net/ice/ice_tm.c Auto-merging drivers/net/ice/ice_ethdev.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 net/ice: hide port and TC layer in Tx sched tree 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/28810/ UNH-IOL DPDK Community Lab