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 1AC44A0C41 for ; Tue, 30 Nov 2021 17:38:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 03083410F7; Tue, 30 Nov 2021 17:38:22 +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 F2843410F7 for ; Tue, 30 Nov 2021 17:38:20 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 BF6DC3FFE1 for ; Tue, 30 Nov 2021 16:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290300; bh=s20T3fh33FtXFvuu+osDGvr9Mz8q1BfgxqTGMoafZjk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pjD3GVJZmtnoHEQEHKC7TPyOm1UuXtPhBWmh3IYqjxqgI4p6sgSuzwTO1oNkk0Qmk jW01/u951WzewY4kKvYO3LNHCVjSo0389J5H41WdZHUwcXG5PXagNDbWoa5F3VpZ8o 2V1MslSj7a0c4dLSub8guyeXL44x64DkeDPqwBlmgCMpCqSuDnWIyhpZdQqIyj3HPR L8z5gTgeKUb5M80yG6LvBuWA/Qx7dLwwNc7y808t64NoJX8qv175FgjzbscMNboAGS XZuCnHVT2z1FwD8UUNxBBjAxhQWQLDh8yV2uEBS1GRmzGqHW3jLs5cI7KyyRU3eD+h oI6rGdZzIGTAA== Received: by mail-ed1-f72.google.com with SMTP id a3-20020a05640213c300b003e7d12bb925so17542474edx.9 for ; Tue, 30 Nov 2021 08:38:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s20T3fh33FtXFvuu+osDGvr9Mz8q1BfgxqTGMoafZjk=; b=H5apfOH7ohFKStFBC7+aAGk870Op3WREuSeO4zgnFvwcSGXhjG1maphVbGHyvrs6MQ TiHLbCp/hzVNSMgIN1pyzRUU+Y0ab7rlLnxnV2yIZVinb9UD5u3iQ7i1EiTRXzX4Z8XP 4C8BuvR/8s5JJP+D5btDSRpS38beJeNVTC5OqP2RDZnmK31MybiCe/k7mnvesJegv5nL CYrXirLm7WhwXi9LPJDNxXArhsSaFwOOidkJSk5I/sX7VBn3bcFLuktiaDTgcZ6JDq7d TKcUwGEh7eEObSMfzVb78FuxMZOR/xMLfkCmp6gdIrHT0BpH5sNPGZbBaTI9UAsNu/5w FIjw== X-Gm-Message-State: AOAM533LrdUjIyNq6+YUD6SIK10xpqpI24Ru4kqcjjCxAAijAvF667tI rvCOhq1dcZVyY+6Zd+kxSWpLu4v+YTLTt/e6Zv3Kvx6ffcXfQBkihbYsTbHjcAcxKGxwV1egNIh d4E5IyNk1tDPqCyvoN8vnpjPU X-Received: by 2002:a17:907:16a1:: with SMTP id hc33mr204322ejc.486.1638290300118; Tue, 30 Nov 2021 08:38:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJyc0XgVSMXZ/dq8+VljnT9J+IsXQIcqVcCBn7KNzKFPCcdt90TbDimMNrh6GKGL+y1kVXZAIA== X-Received: by 2002:a17:907:16a1:: with SMTP id hc33mr204306ejc.486.1638290299950; Tue, 30 Nov 2021 08:38:19 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id qb21sm9610928ejc.78.2021.11.30.08.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:38:19 -0800 (PST) From: christian.ehrhardt@canonical.com To: Cian Ferriter Cc: Honnappa Nagarahalli , dpdk stable Subject: patch 'ring: fix Doxygen comment of internal function' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:05 +0100 Message-Id: <20211130163605.2460997-41-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/701d4730ef56b667c6b89118378b9dfe09a5f8ac Thanks. Christian Ehrhardt --- >From 701d4730ef56b667c6b89118378b9dfe09a5f8ac Mon Sep 17 00:00:00 2001 From: Cian Ferriter Date: Mon, 23 Aug 2021 18:28:44 +0100 Subject: [PATCH] ring: fix Doxygen comment of internal function [ upstream commit 0203a14c72da4ae726056a147cb6e51622c9c28e ] Change "enqueue" to "dequeue" because the __rte_ring_move_cons_head() function is updating the consumer head for dequeue. Fixes: 0dfc98c507b1 ("ring: separate out head index manipulation") Signed-off-by: Cian Ferriter Acked-by: Honnappa Nagarahalli --- lib/librte_ring/rte_ring_c11_mem.h | 2 +- lib/librte_ring/rte_ring_generic.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ring/rte_ring_c11_mem.h b/lib/librte_ring/rte_ring_c11_mem.h index 0fb73a3371..ae886532ee 100644 --- a/lib/librte_ring/rte_ring_c11_mem.h +++ b/lib/librte_ring/rte_ring_c11_mem.h @@ -111,7 +111,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, * @param is_sc * Indicates whether multi-consumer path is needed or not * @param n - * The number of elements we will want to enqueue, i.e. how far should the + * The number of elements we will want to dequeue, i.e. how far should the * head be moved * @param behavior * RTE_RING_QUEUE_FIXED: Dequeue a fixed number of items from a ring diff --git a/lib/librte_ring/rte_ring_generic.h b/lib/librte_ring/rte_ring_generic.h index 953cdbbd5e..79ae4ecb14 100644 --- a/lib/librte_ring/rte_ring_generic.h +++ b/lib/librte_ring/rte_ring_generic.h @@ -107,7 +107,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, * @param is_sc * Indicates whether multi-consumer path is needed or not * @param n - * The number of elements we will want to enqueue, i.e. how far should the + * The number of elements we will want to dequeue, i.e. how far should the * head be moved * @param behavior * RTE_RING_QUEUE_FIXED: Dequeue a fixed number of items from a ring -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:08.468356792 +0100 +++ 0041-ring-fix-Doxygen-comment-of-internal-function.patch 2021-11-30 16:50:05.654872532 +0100 @@ -1 +1 @@ -From 0203a14c72da4ae726056a147cb6e51622c9c28e Mon Sep 17 00:00:00 2001 +From 701d4730ef56b667c6b89118378b9dfe09a5f8ac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0203a14c72da4ae726056a147cb6e51622c9c28e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - lib/ring/rte_ring_c11_pvt.h | 2 +- - lib/ring/rte_ring_generic_pvt.h | 2 +- + lib/librte_ring/rte_ring_c11_mem.h | 2 +- + lib/librte_ring/rte_ring_generic.h | 2 +- @@ -19,4 +20,4 @@ -diff --git a/lib/ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h -index 37e0b2afd6..f895950df4 100644 ---- a/lib/ring/rte_ring_c11_pvt.h -+++ b/lib/ring/rte_ring_c11_pvt.h +diff --git a/lib/librte_ring/rte_ring_c11_mem.h b/lib/librte_ring/rte_ring_c11_mem.h +index 0fb73a3371..ae886532ee 100644 +--- a/lib/librte_ring/rte_ring_c11_mem.h ++++ b/lib/librte_ring/rte_ring_c11_mem.h @@ -32,5 +33,5 @@ -diff --git a/lib/ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h -index c95ad7e12c..5acb6e59be 100644 ---- a/lib/ring/rte_ring_generic_pvt.h -+++ b/lib/ring/rte_ring_generic_pvt.h -@@ -106,7 +106,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, +diff --git a/lib/librte_ring/rte_ring_generic.h b/lib/librte_ring/rte_ring_generic.h +index 953cdbbd5e..79ae4ecb14 100644 +--- a/lib/librte_ring/rte_ring_generic.h ++++ b/lib/librte_ring/rte_ring_generic.h +@@ -107,7 +107,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp,