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 343D8A00C4 for ; Fri, 18 Nov 2022 00:10:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B5EB4067B; Fri, 18 Nov 2022 00:10:54 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 4F34042D1F for ; Fri, 18 Nov 2022 00:10:52 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id g2so2703493wrv.6 for ; Thu, 17 Nov 2022 15:10:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0zmwRxPewHkY0cKr8ftCU3oxzQhV1EB/ULPi8/Xmy+E=; b=bEWL7vMGtytPWG6HX4qpBbLyQ88tQuhRzqLlXpYFIP1CrVC/HGTPuOCaQDPclBxxpG 7MMOzz5nVhEzxIETXAAHbPlZOZSpVPfXfqWbkpBihon3lm4g8xAioHYoqILZXEVCWSQR t2prGG9zuN7pIhM41Wr/Ldp+TOWHQJh3koeJVMNRLllJOx573WmZbHCh1Rd7ANVL3YSI 73+qzcBxkt9GkBQ/agNdb5TJe6PBuG52dig4foq3uXc+DSj5ItoTwLY+5JrEExPDt66I PMPTBmaMJO9JsWODHP0apiWpaWdLrzDD4N2wwxJPUJiChTlScElQzknJHWtFaZCFHc6d iyHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0zmwRxPewHkY0cKr8ftCU3oxzQhV1EB/ULPi8/Xmy+E=; b=lqhjQRGNBeMlUTC4KVi5/aqUghRHKJ/hae9Ua7iFCrD4GA/u6blReDsyjjeA2OS7ln kmjqibm+g0frMI3gw4Txlk0OBHeyEyCWB/OG8MBsKBxfGW5Cxtt+DC/TeSLrsPer3jEH xIy7JvN+IoIpGI9l2lcesaJnei6TPNun4uzWGmgurnCUAaMkLZCIl5ci+xL2A5EN7GJf HlGvBJy6xzvfJ1Y9Un/ZqpDfZuqTMHVUEy5AyYuwcVB5ss+vecNZiZoTbmdLqXoERigN KGjHBIgTxLLfDypGzrqiuVq82kW0ZquCRV8Kt51RaDTnVl1cjnvTqe/mSERlmjWUR1ut 9brQ== X-Gm-Message-State: ANoB5pnrhXjLIMatiTb8q9HaSfkIw0AuqXLCLBopEo1bYczXFY+fWG4n CrNfBYYrVpDmBkZeO4y9jFutQqXdHls= X-Google-Smtp-Source: AA0mqf7bbiyFK6QsRXI8kUGyu3hensV+ETAypb3vQZOnqrr6U1edyZ7ax606Qga+2hoU5oVjwLUszg== X-Received: by 2002:adf:eacc:0:b0:22a:f546:3f68 with SMTP id o12-20020adfeacc000000b0022af5463f68mr2796596wrn.651.1668726651926; Thu, 17 Nov 2022 15:10:51 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id r24-20020adfa158000000b00236b2804d79sm2227238wrr.2.2022.11.17.15.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:10:51 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Coleman Cc: Ray Kinsella , dpdk stable Subject: patch 'doc: fix typo depreciated instead of deprecated' has been queued to stable release 20.11.7 Date: Thu, 17 Nov 2022 23:08:54 +0000 Message-Id: <20221117230859.611465-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117230859.611465-1-luca.boccassi@gmail.com> References: <20221105171146.1520039-47-luca.boccassi@gmail.com> <20221117230859.611465-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.7 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/19/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/c3c9f7a73b90c881f961c98d3066daa29554054e Thanks. Luca Boccassi --- >From c3c9f7a73b90c881f961c98d3066daa29554054e 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/librte_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 4ad87dbfed..d172409d52 100644 --- a/doc/guides/contributing/abi_policy.rst +++ b/doc/guides/contributing/abi_policy.rst @@ -165,7 +165,7 @@ The requirements for changing the ABI are: API becomes non-experimental, then the old one is marked with ``__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`. - At the declaration of the next major ABI version, those ABI changes then diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst index 91ada18dd7..8d346fb656 100644 --- a/doc/guides/contributing/abi_versioning.rst +++ b/doc/guides/contributing/abi_versioning.rst @@ -94,7 +94,7 @@ 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/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h index b0eaf46104..62fa4c792b 100644 --- a/lib/librte_kni/rte_kni.h +++ b/lib/librte_kni/rte_kni.h @@ -66,8 +66,8 @@ struct rte_kni_conf { uint32_t core_id; /* Core ID to bind kernel thread on */ 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__ uint8_t force_bind : 1; /* Flag to bind kernel thread */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-17 23:07:56.749715059 +0000 +++ 0030-doc-fix-typo-depreciated-instead-of-deprecated.patch 2022-11-17 23:07:55.548331629 +0000 @@ -1 +1 @@ -From 98afdb15626841dd6580816678a6df63d12f22b9 Mon Sep 17 00:00:00 2001 +From c3c9f7a73b90c881f961c98d3066daa29554054e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 98afdb15626841dd6580816678a6df63d12f22b9 ] + @@ -16 +18 @@ - lib/kni/rte_kni.h | 4 ++-- + lib/librte_kni/rte_kni.h | 4 ++-- @@ -20 +22 @@ -index 64919b6a2b..5fd4052585 100644 +index 4ad87dbfed..d172409d52 100644 @@ -23 +25 @@ -@@ -167,7 +167,7 @@ The requirements for changing the ABI are: +@@ -165,7 +165,7 @@ The requirements for changing the ABI are: @@ -33 +35 @@ -index dd96527ee5..7afd1c1886 100644 +index 91ada18dd7..8d346fb656 100644 @@ -45,5 +47,5 @@ -diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h -index 37d67509a0..1e508acc82 100644 ---- a/lib/kni/rte_kni.h -+++ b/lib/kni/rte_kni.h -@@ -65,8 +65,8 @@ struct rte_kni_conf { +diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h +index b0eaf46104..62fa4c792b 100644 +--- a/lib/librte_kni/rte_kni.h ++++ b/lib/librte_kni/rte_kni.h +@@ -66,8 +66,8 @@ struct rte_kni_conf {