From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0B41FA0527 for ; Mon, 9 Nov 2020 19:44:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 03EB069A4; Mon, 9 Nov 2020 19:44:35 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by dpdk.org (Postfix) with ESMTP id 1034A69A4 for ; Mon, 9 Nov 2020 19:44:33 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id 10so463544wml.2 for ; Mon, 09 Nov 2020 10:44:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E0PhDo6Jgoldzr0/3v+dpSBDffsoFwVQTwKnGK1V5QY=; b=cnJzL3hWyXOgxK6LMV4z4WsNTf+mtVq2dTC//wE/BNfglyhNf1jqcW+TsmPHEJ2n0h A1fnY+AtH7fxm497clpqNj6Q2EX2xf4c2jU3/E02HRp5fd5C0s+oADcFkGRMVKqtj1Tz nNreoCsefz2N8IgVZ5ewg1D7hF4kt5c6pi4PBAUWTtbJ1cMx+WiehyFS1kE/tPPp/ZcG ybEliQo1W+7JocdeFRPdLFyngYilY/MITdKJm3jjUSVfd5aDCNmBUhQ5HGR6VGVa3EPY zx+f4UaGQ8AITHMNrNzew8iNNTotjGQIv+sNRck4Sr3Uq+ITOuFz8WjgtI4DemvO23+p ZfLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E0PhDo6Jgoldzr0/3v+dpSBDffsoFwVQTwKnGK1V5QY=; b=ECVLKDGm0Y9YtUH1BeeJxT5FoYxB/u4QXYl5KaxcSkILBvGHeK4C2r+BON2r35G7Z8 JAhBGjeCNGjmJaxtqJstAjLZs8MS3HhQzzHkJ1g3JQcXYPMTR1gs5N7YwhamP6w4kkb+ A1EXnENFwco/LR4i5eiU5CZDGt1RJCe8lv3vRvuqKeM2pxl4yD7hBS6LTOX1W95DlFO5 q1fvS5XH+Ub91uUVOaQLOMs1o8Gc2USLBSkMNSGMa5+mhQsobpb4+9G0byP1riDzc+2f 4l5ALSH22yyAUCOb1QtwEkgZ8nStwINebX1csa6EsWGf5mQwb1EvIzqwEJd4hp40hg4X 4JAw== X-Gm-Message-State: AOAM531JCnXsP44AGMPvzK1OWWEVnWgEQnHynm7jAkHfJ4uSft/A/Xhf 9kWOzshIfJAKk3v4AQQzh4fDlXoSrdJymEZH X-Google-Smtp-Source: ABdhPJx/Y8GrcZYB6gWfKxbYnkEML/x9Qbwy77D94GXs9UUW04dooI+q/tgvYy45g2CbHOmro6SX2w== X-Received: by 2002:a7b:cc84:: with SMTP id p4mr588497wma.86.1604947471792; Mon, 09 Nov 2020 10:44:31 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m20sm15904289wrg.81.2020.11.09.10.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:31 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Jesse Brandeburg , Qiming Yang , dpdk stable Date: Mon, 9 Nov 2020 18:40:45 +0000 Message-Id: <20201109184111.3463090-57-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix parameter name in comment' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f0a92d238633a76170680c314586b0e674129eda Thanks. Luca Boccassi --- >From f0a92d238633a76170680c314586b0e674129eda Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 20 Oct 2020 09:06:01 +0800 Subject: [PATCH] net/ice/base: fix parameter name in comment [ upstream commit c675d5f852c37208640737b83398028186a12e46 ] Fix parameter name for cookie_high and cookie_low. Fixes: a90fae1d0755 ("net/ice/base: add admin queue structures and commands") Signed-off-by: Jesse Brandeburg Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_adminq_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h index 2118247a7f..a99670d51e 100644 --- a/drivers/net/ice/base/ice_adminq_cmd.h +++ b/drivers/net/ice/base/ice_adminq_cmd.h @@ -2164,8 +2164,8 @@ struct ice_aqc_event_lan_overflow { * @opcode: AQ command opcode * @datalen: length in bytes of indirect/external data buffer * @retval: return value from firmware - * @cookie_h: opaque data high-half - * @cookie_l: opaque data low-half + * @cookie_high: opaque data high-half + * @cookie_low: opaque data low-half * @params: command-specific parameters * * Descriptor format for commands the driver posts on the Admin Transmit Queue -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.382179192 +0000 +++ 0057-net-ice-base-fix-parameter-name-in-comment.patch 2020-11-09 18:40:11.191312216 +0000 @@ -1 +1 @@ -From c675d5f852c37208640737b83398028186a12e46 Mon Sep 17 00:00:00 2001 +From f0a92d238633a76170680c314586b0e674129eda Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c675d5f852c37208640737b83398028186a12e46 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 3b75cf577a..c105a445ee 100644 +index 2118247a7f..a99670d51e 100644 @@ -22 +23 @@ -@@ -2652,8 +2652,8 @@ struct ice_aqc_clear_health_status { +@@ -2164,8 +2164,8 @@ struct ice_aqc_event_lan_overflow {