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 B12BA43864 for ; Mon, 8 Jan 2024 13:09:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9EC44402EF; Mon, 8 Jan 2024 13:09:49 +0100 (CET) Received: from mail-oi1-f225.google.com (mail-oi1-f225.google.com [209.85.167.225]) by mails.dpdk.org (Postfix) with ESMTP id 5E9D640263 for ; Mon, 8 Jan 2024 13:09:48 +0100 (CET) Received: by mail-oi1-f225.google.com with SMTP id 5614622812f47-3bbbe583e04so928305b6e.3 for ; Mon, 08 Jan 2024 04:09:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1704715787; x=1705320587; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=xFMVUyAUZ8UqIEn5BQPmWUQ+rGyEVflO8cOWrvlNMag=; b=HkeZDS6U0L1D5dmJFg9VbEm4GeozviiRoBahBufyUMq8JT6sCxvl3Yi6fD48XbmbEn Qa9kN2RnV/ugb65ZdyE5/KvWM7Ll8Boi5uqFTTN/tiMV51DTh/B/GblVsW0yfbEhrmXm zNZ5L0MbBa2x+v+kTXUvObfgy0TW5AzZ/QDXo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704715787; x=1705320587; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xFMVUyAUZ8UqIEn5BQPmWUQ+rGyEVflO8cOWrvlNMag=; b=U/nnsZnbfSU92D6zHLSdnPTjAjc9gXkXDOyXIRmaX1kRxJ228RVVjlgvB8smcsTvp4 I6eX7tYcQnC4mHFfwHKgkOvcLCpaAG2Yfshwzm69iguH4/9UmDnhvslAIFaIfRZGDF+6 +zxIdVQ/TawjlLBaaANDgi43woPEsxlNIiRS0W+MUaCnvjnBR6dvrtCYtySFcdgZcigC fWEiIC4AyXFi1xqC5TebR6q6xrmWzD9I1GiS4Mqhc895ZVTmRwzgVqbMTX8B28hOrQ8c +5knCxu7J8UMwai71cMqyeG+S8WJpBBwMpnJNS9P79Hl/cW0HYbauN1D4v/pYDI/1RfF QjXQ== X-Gm-Message-State: AOJu0YyD7giyC9OaKBkuv71uZcaSC1s7iJWoOHvllMqEetAmETHyJT/H zvrU8xIn4Y4GrvV272xrSeClLIJ4ig4bZ2dsoDMObAeumuEAmRyHQXu4TtTqsgCytS+SvQFj7Mq n2/jaiw== X-Google-Smtp-Source: AGHT+IHEapRln96mCY3VdtDR9vJ9ttok9kT0cz92e3bK+Sz1OLeChhO22qw1GPxEIBUSnfk/qYelY56nsC0n X-Received: by 2002:a05:6870:15d4:b0:206:7d0:a1d0 with SMTP id k20-20020a05687015d400b0020607d0a1d0mr1048825oad.101.1704715787715; Mon, 08 Jan 2024 04:09:47 -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 s19-20020a0568302a9300b006dba9c18cafsm402951otu.7.2024.01.08.04.09.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 04:09:47 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Mon, 08 Jan 2024 04:09:47 -0800 (PST) Message-ID: <659be60b.050a0220.37d0f.a851SMTPIN_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 25ECA6052515; Mon, 8 Jan 2024 07:09:47 -0500 (EST) Subject: |WARNING| pw135800-135802 [PATCH] [v4, 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/135800 _apply patch failure_ Submitter: Qi Zhang Date: Monday, January 08 2024 20:21:58 Applied on: CommitID:6ef07151aac4b4d9601d547f94a996d1c71b3871 Apply patch set 135800-135802 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/28829/ UNH-IOL DPDK Community Lab