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 CE2C2A04DD for ; Wed, 28 Oct 2020 11:47:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 335C04C90; Wed, 28 Oct 2020 11:47:39 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 91736CA0C for ; Wed, 28 Oct 2020 11:47:37 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id w1so5160117wrm.4 for ; Wed, 28 Oct 2020 03:47:37 -0700 (PDT) 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=Oxm4ffp85fP6uYMz+3MyJu8GbmmOLLdSthTuXiR7S0M=; b=czj3E0nU//VcvZ5RT0Uh6LGIZ7ktPAbZNHQrqGthS3zPjld6SDKMc4doV2EvTHnP2e W0t4YNBqiW5LyMnEyJZXlExZ2hkLb0dQEwjFkgJGMWdVEoAkxSxReeyKLu7LuNjNiHj3 zbBeT8seaqKiQQmfbYkleOdiZSorH2UsTtyv831dV0hSvyE7+w5UPOF8pt2UlBu6Djj4 3m6mQjpYJ6mV6BbIINrfJJe7JPU0NYWpXNMoZQcMX0hnWyqAyZVlXNUtEsWrknbiKDVi tKw6+yrE1WXxWNz2pZB/lQKfXZFVTyInKTB5qr9ag4/WTCSNwtKZcOFlEO9OqgyXQoPO 6Ltw== 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=Oxm4ffp85fP6uYMz+3MyJu8GbmmOLLdSthTuXiR7S0M=; b=YKBsFgqp9wxGp4SbgWNh+5A1wm2RmClhmqKtH75zlO7bRYrINCYEoS65se8DgqpzPx b+YygYLamJZSyMDtiKgPFNhvXkzgsetoX12r980e8l2xoXdxtk4SBLJDeOVBG4Q4W+Ks E4LALd9+vW0xtvNSULgVYO6dBVEEmYN2QoHBB8z80G3rlc65BWhW0RfO61EJ9ilLNtr2 mYW4QvA32ihlwIQ2lxES977ae6gCHBjCl3zf0vsM13QdXlyyXTgqPA7z6qmTx0AzbeIa NVOH9C6UuD+WoJYyRZ5t+5sk3MyJdfNYY5eG7doh638IKJ6Q7+0nj8j/l3DIT5qzQonf 0+Nw== X-Gm-Message-State: AOAM5335+7dfmyAUqlikCsCEUoKk6X5tpiMJXvEjfvUJfWIR+4/8MaeM BehO/bl9II4fFEAK2Knz7qg= X-Google-Smtp-Source: ABdhPJw6mwfKdTt4EQGktn4pqhA6Ow10YXm1B1L4LlAzROBX2QhBqvuIhtJG6wl6ij09Am42hzp5fQ== X-Received: by 2002:a05:6000:18d:: with SMTP id p13mr8042790wrx.248.1603882057355; Wed, 28 Oct 2020 03:47:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q7sm6272901wrr.39.2020.10.28.03.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:47:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Jesse Brandeburg , Qi Zhang , dpdk stable Date: Wed, 28 Oct 2020 10:43:08 +0000 Message-Id: <20201028104606.3504127-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e/base: fix function header arguments' 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 10/30/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. Thanks. Luca Boccassi --- >From e6d1ea8abf05bf2d0b50f93c06c0cd43e4eab682 Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Sat, 12 Sep 2020 03:00:34 +0000 Subject: [PATCH] net/i40e/base: fix function header arguments [ upstream commit 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac ] Fix them by adding the argument descriptions. Fixes: 0d9d27bb8684 ("i40e/base: prepare local LLDP MIB in TLV") Signed-off-by: Jesse Brandeburg Signed-off-by: Guinan Sun Acked-by: Qi Zhang --- drivers/net/i40e/base/i40e_dcb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c index d99bd6e3f8..5a1f9903a5 100644 --- a/drivers/net/i40e/base/i40e_dcb.c +++ b/drivers/net/i40e/base/i40e_dcb.c @@ -1212,7 +1212,8 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw) /** * i40e_dcb_config_to_lldp - Convert Dcbconfig to MIB format - * @hw: pointer to the hw struct + * @lldpmib: pointer to mib to be output + * @miblen: pointer to u16 for length of lldpmib * @dcbcfg: store for LLDPDU data * * send DCB configuration to FW -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.695181445 +0000 +++ 0029-net-i40e-base-fix-function-header-arguments.patch 2020-10-28 10:35:11.460829376 +0000 @@ -1,12 +1,13 @@ -From 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac Mon Sep 17 00:00:00 2001 +From e6d1ea8abf05bf2d0b50f93c06c0cd43e4eab682 Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Sat, 12 Sep 2020 03:00:34 +0000 Subject: [PATCH] net/i40e/base: fix function header arguments +[ upstream commit 36fcba1ff56a99bd052cc8f1e24fb5fd4afe27ac ] + Fix them by adding the argument descriptions. Fixes: 0d9d27bb8684 ("i40e/base: prepare local LLDP MIB in TLV") -Cc: stable@dpdk.org Signed-off-by: Jesse Brandeburg Signed-off-by: Guinan Sun @@ -16,10 +17,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c -index a07c61e673..388af3d64d 100644 +index d99bd6e3f8..5a1f9903a5 100644 --- a/drivers/net/i40e/base/i40e_dcb.c +++ b/drivers/net/i40e/base/i40e_dcb.c -@@ -1267,7 +1267,8 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw) +@@ -1212,7 +1212,8 @@ enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw) /** * i40e_dcb_config_to_lldp - Convert Dcbconfig to MIB format