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 D3F2FA0557 for ; Wed, 16 Nov 2022 11:41:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D099440F16; Wed, 16 Nov 2022 11:41:00 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 014EA42D17 for ; Wed, 16 Nov 2022 11:40:58 +0100 (CET) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id A66083F0E8 for ; Wed, 16 Nov 2022 10:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668595257; bh=e/PKWH9NG3pjgWLcjtwvUPvj8Vfpi1qT4aFcMeTRP5I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=esqD1F2N4nYx4SOCaEnK4IoOdeIJuRfiq+4t1OXthzhswA/IZ8YlJ6+bJva7rkLkh JPs61AAPHvc390R6EWcEXA+qz/aTSc60NG264FxEJ9zItLawZBW2AfhnuRfFeMFSPV Kn4Ha7PFhZEaiVFHuHoGEYW5wY8xdfES5YZdRfpOOYeQiQaUvdOu7s6048jEn90Yno Eswa/+/mINP8qDPZkf/86UtK5WiKCKfkBn1B/qIjk2fVu+REZPhcYg4QaAug3+k0M8 vnEjcOmwEBwHfZszvMcgtMK/Fwg11siLf7PVHPDhEMoBEQKCd5LYE2s/xHftj9NTJu 9s3mT0SwDQCLw== Received: by mail-wr1-f69.google.com with SMTP id k1-20020adfb341000000b00238745c9b1aso3547099wrd.5 for ; Wed, 16 Nov 2022 02:40:57 -0800 (PST) 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=e/PKWH9NG3pjgWLcjtwvUPvj8Vfpi1qT4aFcMeTRP5I=; b=mzSJl+aS9EoCsvFqYJtTh0dFM6WX3ClAjXBDLRKyi8FgfyQFB9UtPRXF13yoUI00wU pQpIYKsHJ6YIHli+I5UEHS8KDlMLRouHU59CfCRaFfuXj7u+UHyONUD2oHycEj5+3Hls 60IxVreKvxXgobhbt0lAzDdztFW/XF6fjd2LFgxEabWAxn54lWWqKdrME8FXo+GFkeEf 4r4C3QgIK8I2940/KFzpJwcpFEXAj4clwlRB3njNSDk8uU94YyJjKedQ/Nde86jK6pCy tJ8Rr4iwQBUFv8zDRT/ZPAYhhFa5IzmESZERfbjc6N3iFYkP9DznDIszB1o+EVx3f9tR Ux5A== X-Gm-Message-State: ANoB5plP26M4qk5hNnbedV7NICq9pkYySqEqiGhwdypRQ39BMU8V+aL3 j/JaLJK5Xirl90jRSsYp4+hlAqSujknq48xyx04QKNjZYEzepAz7Lw8C0vXbkQbhKlRu8IXymUX wdYRzec/u/UTGZGdhAWrUAsEU X-Received: by 2002:a05:600c:a10:b0:3cf:75f4:794a with SMTP id z16-20020a05600c0a1000b003cf75f4794amr1736363wmp.16.1668595255494; Wed, 16 Nov 2022 02:40:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf7W3sh+g/34VueXehsajbSu+eoU1KpY0jWH48hjz5a9GcO5zHJPrdWjOORCJnnmWZqfOmSfAQ== X-Received: by 2002:a05:600c:a10:b0:3cf:75f4:794a with SMTP id z16-20020a05600c0a1000b003cf75f4794amr1736355wmp.16.1668595255252; Wed, 16 Nov 2022 02:40:55 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39e5:dd00:975:f38b:96af:696f]) by smtp.gmail.com with ESMTPSA id s3-20020adfecc3000000b0022e653f5abbsm14719833wro.69.2022.11.16.02.40.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 02:40:54 -0800 (PST) From: christian.ehrhardt@canonical.com To: Stephen Coleman Cc: Ray Kinsella , dpdk stable Subject: patch 'doc: fix typo depreciated instead of deprecated' has been queued to stable release 19.11.14 Date: Wed, 16 Nov 2022 11:40:09 +0100 Message-Id: <20221116104012.2975036-14-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116104012.2975036-1-christian.ehrhardt@canonical.com> References: <20221116104012.2975036-1-christian.ehrhardt@canonical.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 19.11.14 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/23/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/fc30e9e6e09b562dbcb4d768acba28d5d6ad275a Thanks. Christian Ehrhardt --- >From fc30e9e6e09b562dbcb4d768acba28d5d6ad275a 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 87942c8ac3..7d0a48e880 100644 --- a/doc/guides/contributing/abi_policy.rst +++ b/doc/guides/contributing/abi_policy.rst @@ -163,7 +163,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 ea9d99606b..6160fa1ef3 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 ``21``, 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 855facd1a3..0028a4de83 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.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-16 11:36:50.948338709 +0100 +++ 0014-doc-fix-typo-depreciated-instead-of-deprecated.patch 2022-11-16 11:36:50.440775625 +0100 @@ -1 +1 @@ -From 98afdb15626841dd6580816678a6df63d12f22b9 Mon Sep 17 00:00:00 2001 +From fc30e9e6e09b562dbcb4d768acba28d5d6ad275a 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 87942c8ac3..7d0a48e880 100644 @@ -23 +25 @@ -@@ -167,7 +167,7 @@ The requirements for changing the ABI are: +@@ -163,7 +163,7 @@ The requirements for changing the ABI are: @@ -33 +35 @@ -index dd96527ee5..7afd1c1886 100644 +index ea9d99606b..6160fa1ef3 100644 @@ -39 +41 @@ - However when a new ABI version is declared, for example DPDK ``22``, old + However when a new ABI version is declared, for example DPDK ``21``, old @@ -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 855facd1a3..0028a4de83 100644 +--- a/lib/librte_kni/rte_kni.h ++++ b/lib/librte_kni/rte_kni.h +@@ -66,8 +66,8 @@ struct rte_kni_conf {