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 2F0EBA0527 for ; Mon, 9 Nov 2020 19:46:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2657D69C8; Mon, 9 Nov 2020 19:46:01 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by dpdk.org (Postfix) with ESMTP id 821D969C8 for ; Mon, 9 Nov 2020 19:45:59 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id a65so456013wme.1 for ; Mon, 09 Nov 2020 10:45:59 -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=LEn5NLu6aUWBfTNMOXqbxxmRjkArMzMY9K8+ZylMHMQ=; b=jrLkP3oqdDjyonPQNbkpTDGUqxOhoTAP5wPIYnjjbHKg35B08Vc4er2YLoKVT4qSF4 n/AfUhjfjvxh/qyYEauf71RinJlkzYHrgHBK80OMdftrSZS06mqfoN8exo99Pjuft0S+ hJefIfmWqicx8d4C69DdtRa3z2sjVJzaecabc45GMK0BSM3aOxdsWizRdJBMVCOk0LEK 8zQyREQCS1acmmHiscwqqIO2zQ0VtOGc4esfTQsvyq08XEa9tRkt5MqgnLy7XtPvTjOe umT+sWMToOU/xvmiHCtHyp/zE0Z91dR3X/FxHGynlTz3sHKCuu4TSkwXdWadOFr2EX57 tUQA== 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=LEn5NLu6aUWBfTNMOXqbxxmRjkArMzMY9K8+ZylMHMQ=; b=oNFhs+w+uPrwJWknqAAtIqeBImVRFzs4AHJ5I+FE10ah8iqAAbqrwJ6hrz+I/sTZFL rFRUWZAeG09ulx57i3Bj+VNZuQZBc5dTiIVJi1P+ZruibND8RLx1QbXXioZauzabOFVa G1mnUMPqg9XviHd3Irc/hyqaE6zleqJilnVCijxoXL1hFj5MLF5SZQR+ihV5rRyJm4LU /IrTM2CuDkm16WIklq3Exv2FbX7UVpGuz1r7yJtV99shWu7J4WRpZez5/wqP6Lj/B5/d GyqnATpAuWEYXGsUQcrWCX70uBwv4an6p/qRih4wjc1wLq5gje2QvwC8SWhgErPccAIL 9kag== X-Gm-Message-State: AOAM530gtId+sORyaiLO8RciI21Idt4lrz4Sd23biBue301KMzgroU1F EoZmacODwksb7x9WpQhpKIFSBpAqSQE3HtBQ X-Google-Smtp-Source: ABdhPJxCwgXaZD6EvQDCB26/yJO7Wtld7ns60zftIZyDcshWOEL/VSrcljJeFE0ofHwoWdCyGh2x4Q== X-Received: by 2002:a1c:4957:: with SMTP id w84mr579789wma.84.1604947558263; Mon, 09 Nov 2020 10:45:58 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l24sm363708wmi.7.2020.11.09.10.45.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:45:57 -0800 (PST) From: luca.boccassi@gmail.com To: Ciara Power Cc: John McNamara , dpdk stable Date: Mon, 9 Nov 2020 18:41:10 +0000 Message-Id: <20201109184111.3463090-82-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 'doc: fix typo in KNI guide' 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/fb2180f9f25cc504ab26d2fba7bceed4ba26cbdb Thanks. Luca Boccassi --- >From fb2180f9f25cc504ab26d2fba7bceed4ba26cbdb Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Mon, 2 Nov 2020 15:23:48 +0000 Subject: [PATCH] doc: fix typo in KNI guide [ upstream commit cbd2f21ab76b5aa8d7c7967b37062cfb57d8002b ] The typo "withe" should have been "with the". This is now fixed. Fixes: 89397a01ce4a ("kni: set default carrier state of interface") Signed-off-by: Ciara Power Acked-by: John McNamara --- doc/guides/prog_guide/kernel_nic_interface.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst index 32d09ccf82..f5904f4d1b 100644 --- a/doc/guides/prog_guide/kernel_nic_interface.rst +++ b/doc/guides/prog_guide/kernel_nic_interface.rst @@ -178,7 +178,7 @@ KNI Creation and Deletion ------------------------- Before any KNI interfaces can be created, the ``rte_kni`` kernel module must -be loaded into the kernel and configured withe ``rte_kni_init()`` function. +be loaded into the kernel and configured with the ``rte_kni_init()`` function. The KNI interfaces are created by a DPDK application dynamically via the ``rte_kni_alloc()`` function. -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:14.194499904 +0000 +++ 0082-doc-fix-typo-in-KNI-guide.patch 2020-11-09 18:40:11.243313025 +0000 @@ -1 +1 @@ -From cbd2f21ab76b5aa8d7c7967b37062cfb57d8002b Mon Sep 17 00:00:00 2001 +From fb2180f9f25cc504ab26d2fba7bceed4ba26cbdb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cbd2f21ab76b5aa8d7c7967b37062cfb57d8002b ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index de5d75bd4c..1ce03ec1a3 100644 +index 32d09ccf82..f5904f4d1b 100644