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 56506A0093 for ; Thu, 28 May 2020 18:26:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4CFE31DC20; Thu, 28 May 2020 18:26:30 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 39FCB1DC1E for ; Thu, 28 May 2020 18:26:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683188; 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=NBIjrgrN7Gts5b8f0nNpfq9sudCX6/xPejaNAdoar/o=; b=UgBLAByb+QAHVgn9biLnz+Jn+TQiV4+oZNjFDdGMvVN76Ebv7uXLfY292hhg1LEFlEShfb 12f/9sRwLSCJtg8CiWafEOc0BNGtTd3RED1p/hqJICGdathai/M3QvJ/xGpLf3b3BmBSXg svUQNIkZSZDvZYJ/a6kYYSwue9eWpjE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-159-WcNH6hZ6Nsm3nQjjb2zFMg-1; Thu, 28 May 2020 12:26:19 -0400 X-MC-Unique: WcNH6hZ6Nsm3nQjjb2zFMg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8BA6EC1A1; Thu, 28 May 2020 16:26:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEA2E60C87; Thu, 28 May 2020 16:26:17 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Date: Thu, 28 May 2020 17:23:17 +0100 Message-Id: <20200528162322.7863-90-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'lpm6: fix comments spelling' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/3f9b2fc930b59e884a7f91750adf4a15188b847c Thanks. Kevin. --- >From 3f9b2fc930b59e884a7f91750adf4a15188b847c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 10 Mar 2020 09:26:22 -0700 Subject: [PATCH] lpm6: fix comments spelling [ upstream commit e2635408a0e3e190c22362e8dd4f8226f6e73308 ] Fix spelling errors in comments. Fixes: e480688dce6d ("lpm6: add incremental update on delete") Signed-off-by: Stephen Hemminger --- lib/librte_lpm/rte_lpm6.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c index a71e63fa6f..5b0db3b549 100644 --- a/lib/librte_lpm/rte_lpm6.c +++ b/lib/librte_lpm/rte_lpm6.c @@ -826,5 +826,5 @@ VERSION_SYMBOL(rte_lpm6_add, _v20, 2.0); * Returns: * 0 on success - * -ENOSPC not enought tbl8 left + * -ENOSPC not enough tbl8 left */ static int @@ -856,5 +856,5 @@ simulate_add(struct rte_lpm6 *lpm, const uint8_t *masked_ip, uint8_t depth) if (tbl8_available(lpm) < total_need_tbl_nb) - /* not enought tbl8 to add a rule */ + /* not enough tbl8 to add a rule */ return -ENOSPC; @@ -1316,5 +1316,5 @@ rule_find_range(struct rte_lpm6 *lpm, const uint8_t *ip, uint8_t depth, depth -= 24; - /* interate through levels (tbl8s) + /* iterate through levels (tbl8s) * until we reach the last one */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.766842442 +0100 +++ 0090-lpm6-fix-comments-spelling.patch 2020-05-28 17:12:59.184554522 +0100 @@ -1 +1 @@ -From e2635408a0e3e190c22362e8dd4f8226f6e73308 Mon Sep 17 00:00:00 2001 +From 3f9b2fc930b59e884a7f91750adf4a15188b847c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e2635408a0e3e190c22362e8dd4f8226f6e73308 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index f5979fb159..37baabb26d 100644 +index a71e63fa6f..5b0db3b549 100644 @@ -20 +21 @@ -@@ -815,5 +815,5 @@ add_step(struct rte_lpm6 *lpm, struct rte_lpm6_tbl_entry *tbl, +@@ -826,5 +826,5 @@ VERSION_SYMBOL(rte_lpm6_add, _v20, 2.0); @@ -27 +28 @@ -@@ -845,5 +845,5 @@ simulate_add(struct rte_lpm6 *lpm, const uint8_t *masked_ip, uint8_t depth) +@@ -856,5 +856,5 @@ simulate_add(struct rte_lpm6 *lpm, const uint8_t *masked_ip, uint8_t depth) @@ -34 +35 @@ -@@ -1213,5 +1213,5 @@ rule_find_range(struct rte_lpm6 *lpm, const uint8_t *ip, uint8_t depth, +@@ -1316,5 +1316,5 @@ rule_find_range(struct rte_lpm6 *lpm, const uint8_t *ip, uint8_t depth,