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 E6FF5A00C2 for ; Wed, 23 Nov 2022 19:05:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E263F42DA3; Wed, 23 Nov 2022 19:05:13 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1AAAF40E5A for ; Wed, 23 Nov 2022 19:05:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vnx+VlBp+6VspCfm0yXHgeEP4z2Y6sphkBwYKZNx8+A=; b=AexAdUEv6dqyYC9A9pzqj4xLL31hV/0GNfEsUV6tY6u3NtiYUczetKgudY7+aEIA8wwHCS kfwwCIULF7b3UcY8vJk5NA8uCxdXym+CFEvcezSu1DLo0ag3EQLS5+RN8bT9SYc/RBLGK1 FW33gz4cFe8x4f35rDuLPqAzr9jYAM4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-645-0rbd5Q7wMiarjpwcOivAsA-1; Wed, 23 Nov 2022 13:05:06 -0500 X-MC-Unique: 0rbd5Q7wMiarjpwcOivAsA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 07636101E14D; Wed, 23 Nov 2022 18:05:06 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8E1D492B07; Wed, 23 Nov 2022 18:05:04 +0000 (UTC) From: Kevin Traynor To: Stephen Coleman Cc: Ray Kinsella , dpdk stable Subject: patch 'doc: fix typo depreciated instead of deprecated' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:50 +0000 Message-Id: <20221123180413.733554-37-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.3 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/28/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b16910eabc41621208379dd02e47e86e9c01bf10 Thanks. Kevin --- >From b16910eabc41621208379dd02e47e86e9c01bf10 Mon Sep 17 00:00:00 2001 From: Stephen Coleman Date: Tue, 19 Apr 2022 17:01:02 +0800 Subject: [PATCH] doc: fix typo depreciated instead of deprecated [ upstream commit 98afdb15626841dd6580816678a6df63d12f22b9 ] Same issue was fixed in ABI policy in ec5c0f8, but more of this misuse persist in comments and docs. 'depreciated' means diminish in value over a period of time. It should not appear here. Signed-off-by: Stephen Coleman Acked-by: Ray Kinsella --- doc/guides/contributing/abi_policy.rst | 2 +- doc/guides/contributing/abi_versioning.rst | 2 +- lib/kni/rte_kni.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guides/contributing/abi_policy.rst b/doc/guides/contributing/abi_policy.rst index 64919b6a2b..5fd4052585 100644 --- a/doc/guides/contributing/abi_policy.rst +++ b/doc/guides/contributing/abi_policy.rst @@ -168,5 +168,5 @@ The requirements for changing the ABI are: ``__rte_deprecated``. - - The depreciated API should follow the notification process to be removed, + - The deprecated API should follow the notification process to be removed, see :ref:`deprecation_notices`. diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst index dd96527ee5..7afd1c1886 100644 --- a/doc/guides/contributing/abi_versioning.rst +++ b/doc/guides/contributing/abi_versioning.rst @@ -95,5 +95,5 @@ that library. However when a new ABI version is declared, for example DPDK ``22``, old -depreciated functions may be safely removed at this point and the entire old +deprecated functions may be safely removed at this point and the entire old major ABI version removed, see the section :ref:`deprecating_entire_abi` on how this may be done. diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h index b0eaf46104..62fa4c792b 100644 --- a/lib/kni/rte_kni.h +++ b/lib/kni/rte_kni.h @@ -67,6 +67,6 @@ struct rte_kni_conf { uint16_t group_id; /* Group ID */ unsigned mbuf_size; /* mbuf size */ - struct rte_pci_addr addr; /* depreciated */ - struct rte_pci_id id; /* depreciated */ + struct rte_pci_addr addr; /* deprecated */ + struct rte_pci_id id; /* deprecated */ __extension__ -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.948499544 +0000 +++ 0037-doc-fix-typo-depreciated-instead-of-deprecated.patch 2022-11-23 09:55:57.081149337 +0000 @@ -1 +1 @@ -From 98afdb15626841dd6580816678a6df63d12f22b9 Mon Sep 17 00:00:00 2001 +From b16910eabc41621208379dd02e47e86e9c01bf10 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 98afdb15626841dd6580816678a6df63d12f22b9 ] + @@ -42 +44 @@ -index 37d67509a0..1e508acc82 100644 +index b0eaf46104..62fa4c792b 100644 @@ -45 +47 @@ -@@ -66,6 +66,6 @@ struct rte_kni_conf { +@@ -67,6 +67,6 @@ struct rte_kni_conf {