From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 4E634A051C
	for <public@inbox.dpdk.org>; Tue, 11 Feb 2020 12:30:29 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 468C72BE9;
	Tue, 11 Feb 2020 12:30:29 +0100 (CET)
Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com
 [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 761DF2BE9
 for <stable@dpdk.org>; Tue, 11 Feb 2020 12:30:28 +0100 (CET)
Received: by mail-wr1-f66.google.com with SMTP id k11so11868359wrd.9
 for <stable@dpdk.org>; Tue, 11 Feb 2020 03:30:28 -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=8Sq69fAR2H4LJ8Rjy897NsMr8880hSrxKWZnbGvsvh4=;
 b=KuJac9rOX228XmILtIpDaq6eyX61rhEcq/Nh5Jxl2V4BLAIFvPWtBxt1WKrA54DAJH
 JRuFE2bSMVDWnrv+cNgUrc3zAE1rWKR3FiopY43CXfNxLr7f7M9rysC1Dxerp2KztXxL
 k9Z3/w58BJxCWS7lRvxAqVj1v4YQRn2lTse8xjeB7R31oiSXZBGiexSjIl20PPcgSgEu
 kbbi9kJilL26Yi/R9W++67GmxX/Ef7nOyXu21l2tLMBEis6C56b+dITRuyKsAB2pHmY2
 NZ0TT5xKi45PSebdlbs5IsgL53NzQ3TI2oe3l3xtnd/bL0uaxhRHGRCLYvMF5qWyPf7h
 bPPA==
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=8Sq69fAR2H4LJ8Rjy897NsMr8880hSrxKWZnbGvsvh4=;
 b=GjbrDxUgS6BdprL5rSTniIDJbZhUFZX+9xANmAtCWE/gk4KZt/07v1TeFrOhz35PJ+
 asVb99VlVVcmAHgZ94+NfEe8GWj8/ZTYFDigOtr4XMNJVjiCFxPpBDK9JFw9ahtaOJqL
 u9hYkbliQnELdKX8JoGRjl9jly+HgV5kM5mQ36rVqTRSDFCFv3ftrfSAIulbYE7mwkw9
 Hr0f/RMO83NCbt6WgZfl4Ayc42kXyrXYIpRp0Nho34fT4Oujl04XS2OSplhL8dt5or+G
 soKsGSsV3OxF0HpYAICdu9Nej2nRzZ7IyJKdLApJ0wKqKF2aspDqZHyR+VRK5BO7QuNo
 7/Vw==
X-Gm-Message-State: APjAAAV4v8NTjLUnS5UyTL4GlObn8MC8aIBj7HkWVGgaFerzWeitg86r
 L70M3DSeEJuE38CzGfZoe628O+SB5xo=
X-Google-Smtp-Source: APXvYqx007xYDyp82dRolsk7dLokQyjl3dFrPoKVLkLhcmtWMqAxgLXfXYZn/W9GKdiiKXJjMuo8qQ==
X-Received: by 2002:a5d:4d12:: with SMTP id z18mr8235240wrt.139.1581420628188; 
 Tue, 11 Feb 2020 03:30:28 -0800 (PST)
Received: from localhost ([88.98.246.218])
 by smtp.gmail.com with ESMTPSA id i4sm3265952wmd.23.2020.02.11.03.30.27
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 11 Feb 2020 03:30:27 -0800 (PST)
From: luca.boccassi@gmail.com
To: Xiaoyun Li <xiaoyun.li@intel.com>
Cc: Jingjing Wu <jingjing.wu@intel.com>,
	dpdk stable <stable@dpdk.org>
Date: Tue, 11 Feb 2020 11:20:56 +0000
Message-Id: <20200211112216.3929-110-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com>
References: <20200211112216.3929-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'doc: fix igb_uio parameter in ntb guide' has
	been queued to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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 0a20f25097cb3755261c66e45c14b42109f1a86c Mon Sep 17 00:00:00 2001
From: Xiaoyun Li <xiaoyun.li@intel.com>
Date: Wed, 4 Dec 2019 23:19:31 +0800
Subject: [PATCH] doc: fix igb_uio parameter in ntb guide

[ upstream commit 971a48e7c8b945159c012d9f0c756197282c7ae8 ]

In prerequisites of ntb guide, the correct flag when loading igb_uio
module should be `wc_activate=1`, not `wc_active=1`.

Fixes: 11b5c7daf019 ("raw/ntb: add enqueue and dequeue functions")

Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
Acked-by: Jingjing Wu <jingjing.wu@intel.com>
---
 doc/guides/rawdevs/ntb.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst
index 58472135f5..aa7d809649 100644
--- a/doc/guides/rawdevs/ntb.rst
+++ b/doc/guides/rawdevs/ntb.rst
@@ -52,11 +52,11 @@ NTB PMD needs kernel PCI driver to support write combining (WC) to get
 better performance. The difference will be more than 10 times.
 To enable WC, there are 2 ways.
 
-- Insert igb_uio with ``wc_active=1`` flag if use igb_uio driver.
+- Insert igb_uio with ``wc_activate=1`` flag if use igb_uio driver.
 
 .. code-block:: console
 
-  insmod igb_uio.ko wc_active=1
+  insmod igb_uio.ko wc_activate=1
 
 - Enable WC for NTB device's Bar 2 and Bar 4 (Mapped memory) manually.
   The reference is https://www.kernel.org/doc/html/latest/x86/mtrr.html
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:42.633754258 +0000
+++ 0110-doc-fix-igb_uio-parameter-in-ntb-guide.patch	2020-02-11 11:17:38.576004638 +0000
@@ -1,13 +1,14 @@
-From 971a48e7c8b945159c012d9f0c756197282c7ae8 Mon Sep 17 00:00:00 2001
+From 0a20f25097cb3755261c66e45c14b42109f1a86c Mon Sep 17 00:00:00 2001
 From: Xiaoyun Li <xiaoyun.li@intel.com>
 Date: Wed, 4 Dec 2019 23:19:31 +0800
 Subject: [PATCH] doc: fix igb_uio parameter in ntb guide
 
+[ upstream commit 971a48e7c8b945159c012d9f0c756197282c7ae8 ]
+
 In prerequisites of ntb guide, the correct flag when loading igb_uio
 module should be `wc_activate=1`, not `wc_active=1`.
 
 Fixes: 11b5c7daf019 ("raw/ntb: add enqueue and dequeue functions")
-Cc: stable@dpdk.org
 
 Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
 Acked-by: Jingjing Wu <jingjing.wu@intel.com>