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 F1577A0527 for ; Mon, 9 Nov 2020 19:45:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E9E206883; Mon, 9 Nov 2020 19:45:48 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by dpdk.org (Postfix) with ESMTP id E56B79AEB for ; Mon, 9 Nov 2020 19:45:46 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 10so466676wml.2 for ; Mon, 09 Nov 2020 10:45:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7WOcdl2Gh/NmohGxj+vNb7CWH4oa4cTZRAsJ2v/K9LY=; b=hBNCOA14rzjjL/BVPfDQi5QXzMmFbyonkGneo/kp1p141o1/vEHvoEaTuggPTytw2K CAs95q80dwSB6FsqbVGSrZd5A+YzYxmfAXHW3B6F9hkHj1GdLQ9tgyUcx47Yj8fNHMkq a+N1SsZ+aIWyiq7AZznao3C2mFfM44Ivza/rNnKaJL2zvGIsdGHYfqmGtLI198YmUmwd l6NKlD4YICAQ0TBeUF+FG5cXXnw16SJHP/DD2fe4Fqz9XtpJ3lvvtsDF9FFofomAtK0/ +qIl7RZuh7f92FplCvWSO9EtWKObUaJsjRapl4b+Zu+uYv6kdgMkCYlC85nDgvZIyvLG HvfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7WOcdl2Gh/NmohGxj+vNb7CWH4oa4cTZRAsJ2v/K9LY=; b=bcuqEvrvSNNdnsmsJxFbjPUO5doBPS5x2h0qW2o+DsJeVufft5MLbZqor8OCKDmxvM 6VpB7stO54pFMq2Ursq0tmzFs5ymt9GxB7ql0IzDx8ADPoVr+I7Ai4H48qxWZavIKCNR lmgfH7ZQ0REZIKLjqW5yc6R26SFGhSKBu1deEMJv/kmzrYUjwKvq3EBzRkTUTkWUibgk CXFrn0gKpR60QmfjJMHwKaFZuWkfSkto/2FVc5AbRDUXIod1HiU7Lgq3ZBJOh6VB2z5n y4EXNsn7PL2jcQzrAryN4hv7mM4RgYohGG/qLeSNCGHq72GHL/AiYqYRlVwki58qzVfB 8k6w== X-Gm-Message-State: AOAM5307htkW7QknWMlNbtpK+rqi4u6wVwz8ewATN0XcYyM7T/hK0N2i eXQSE4fxD9HuJnpwdphEVssYTjd1GpToAfcn X-Google-Smtp-Source: ABdhPJwJWoCQsvzkxrOkNf9ea0O1FyOI3+hYwdmgEh4niAHMXaGxE2cAfcRT/YIhXin8ngZTCiu+fg== X-Received: by 2002:a1c:21c1:: with SMTP id h184mr609196wmh.106.1604947545630; Mon, 09 Nov 2020 10:45:45 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g186sm803562wma.1.2020.11.09.10.45.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:45:44 -0800 (PST) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: dpdk stable Date: Mon, 9 Nov 2020 18:41:08 +0000 Message-Id: <20201109184111.3463090-80-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'fix spellings that Lintian complains about' has been queued to stable release 19.11.6 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 stable release 19.11.6 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/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/50eb4f840a7ba0488cae324238fb3ac89dfcbae9 Thanks. Luca Boccassi --- >From 50eb4f840a7ba0488cae324238fb3ac89dfcbae9 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 29 Oct 2020 13:36:33 +0000 Subject: [PATCH] fix spellings that Lintian complains about [ upstream commit e8cff6142a2768983bb7950e5f2b0cc00dd59f33 ] Fixes: 103809d032cd ("app/test-fib: add test application for FIB") Fixes: 1265b5372d9d ("net/hns3: add some definitions for data structure and macro") Fixes: a85e378cc606 ("net/ixgbe/base: add debug traces") Fixes: 4861cde46116 ("i40e: new poll mode driver") Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Fixes: 86a2265e59d7 ("qede: add SRIOV support") Fixes: 1db4d2330bc8 ("net/virtio-user: check negotiated features before set") Signed-off-by: Luca Boccassi --- drivers/net/hns3/hns3_ethdev.h | 2 +- drivers/net/i40e/i40e_ethdev_vf.c | 2 +- drivers/net/ixgbe/base/ixgbe_x540.c | 2 +- drivers/net/netvsc/hn_rndis.c | 2 +- drivers/net/qede/base/ecore_sriov.c | 2 +- drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 6e9173abd4..e0a04f8744 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -145,7 +145,7 @@ enum hns3_media_type { struct hns3_mac { uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; - bool default_addr_setted; /* whether default addr(mac_addr) is setted */ + bool default_addr_setted; /* whether default addr(mac_addr) is set */ uint8_t media_type; uint8_t phy_addr; uint8_t link_duplex : 1; /* ETH_LINK_[HALF/FULL]_DUPLEX */ diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 4cdffe9127..f6a47d9a92 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -263,7 +263,7 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data) case VIRTCHNL_EVENT_RESET_IMPENDING: vf->vf_reset = true; vf->pend_msg |= PFMSG_RESET_IMPENDING; - PMD_DRV_LOG(INFO, "vf is reseting"); + PMD_DRV_LOG(INFO, "VF is resetting"); break; case VIRTCHNL_EVENT_PF_DRIVER_CLOSE: vf->dev_closed = true; diff --git a/drivers/net/ixgbe/base/ixgbe_x540.c b/drivers/net/ixgbe/base/ixgbe_x540.c index d65f47c181..d91633a2da 100644 --- a/drivers/net/ixgbe/base/ixgbe_x540.c +++ b/drivers/net/ixgbe/base/ixgbe_x540.c @@ -784,7 +784,7 @@ s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u32 mask) * bits in the SW_FW_SYNC register. */ if (ixgbe_get_swfw_sync_semaphore(hw)) { - DEBUGOUT("Failed to get NVM sempahore and register semaphore while forcefully ignoring FW sempahore bit(s) and setting SW semaphore bit(s), returning IXGBE_ERR_SWFW_SYNC\n"); + DEBUGOUT("Failed to get NVM semaphore and register semaphore while forcefully ignoring FW semaphore bit(s) and setting SW semaphore bit(s), returning IXGBE_ERR_SWFW_SYNC\n"); return IXGBE_ERR_SWFW_SYNC; } swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC_BY_MAC(hw)); diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c index bce3dab68c..6a976ce5e8 100644 --- a/drivers/net/netvsc/hn_rndis.c +++ b/drivers/net/netvsc/hn_rndis.c @@ -276,7 +276,7 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan, sg.len = reqlen; if (sg.ofs + reqlen > PAGE_SIZE) { - PMD_DRV_LOG(ERR, "RNDIS request crosses page bounary"); + PMD_DRV_LOG(ERR, "RNDIS request crosses page boundary"); return -EINVAL; } diff --git a/drivers/net/qede/base/ecore_sriov.c b/drivers/net/qede/base/ecore_sriov.c index e60257e190..6633d6b42e 100644 --- a/drivers/net/qede/base/ecore_sriov.c +++ b/drivers/net/qede/base/ecore_sriov.c @@ -4075,7 +4075,7 @@ ecore_iov_execute_vf_flr_cleanup(struct ecore_hwfn *p_hwfn, rc = ecore_iov_enable_vf_access(p_hwfn, p_ptt, p_vf); if (rc) { /* TODO - again, a mess... */ - DP_ERR(p_hwfn, "Failed to re-enable VF[%d] acces\n", + DP_ERR(p_hwfn, "Failed to re-enable VF[%d] access\n", vfid); return rc; } diff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c index acddefa33d..79b8446f8e 100644 --- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c +++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c @@ -39,7 +39,7 @@ vhost_kernel_tap_set_offload(int fd, uint64_t features) /* Check if our kernel supports TUNSETOFFLOAD */ if (ioctl(fd, TUNSETOFFLOAD, 0) != 0 && errno == EINVAL) { - PMD_DRV_LOG(ERR, "Kernel does't support TUNSETOFFLOAD\n"); + PMD_DRV_LOG(ERR, "Kernel doesn't support TUNSETOFFLOAD\n"); return -ENOTSUP; } -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:14.124550272 +0000 +++ 0080-fix-spellings-that-Lintian-complains-about.patch 2020-11-09 18:40:11.239312963 +0000 @@ -1 +1 @@ -From e8cff6142a2768983bb7950e5f2b0cc00dd59f33 Mon Sep 17 00:00:00 2001 +From 50eb4f840a7ba0488cae324238fb3ac89dfcbae9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e8cff6142a2768983bb7950e5f2b0cc00dd59f33 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17 +17,0 @@ - app/test-fib/main.c | 4 ++-- @@ -24 +24 @@ - 7 files changed, 8 insertions(+), 8 deletions(-) + 6 files changed, 6 insertions(+), 6 deletions(-) @@ -26,17 +25,0 @@ -diff --git a/app/test-fib/main.c b/app/test-fib/main.c -index 9e6a4f2231..b0a97b0d7e 100644 ---- a/app/test-fib/main.c -+++ b/app/test-fib/main.c -@@ -629,10 +629,10 @@ print_usage(void) - "[-s ]\n" - "[-a ]\n" -- "[-b ]\n\tavailible options for ipv4\n" -+ "[-b ]\n\tavailable options for ipv4\n" - "\t\trib - RIB based FIB\n" - "\t\tdir - DIR24_8 based FIB\n" -- "\tavailible options for ipv6:\n" -+ "\tavailable options for ipv6:\n" - "\t\trib - RIB based FIB\n" - "\t\ttrie - TRIE based FIB\n" - "defaults are: dir for ipv4 and trie for ipv6\n" @@ -44 +27 @@ -index 63e0c2fb36..4c40df1cbb 100644 +index 6e9173abd4..e0a04f8744 100644 @@ -47 +30 @@ -@@ -169,7 +169,7 @@ enum hns3_media_type { +@@ -145,7 +145,7 @@ enum hns3_media_type { @@ -57 +40 @@ -index 6e6eef5a6a..c26b036b85 100644 +index 4cdffe9127..f6a47d9a92 100644 @@ -60 +43 @@ -@@ -260,7 +260,7 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data) +@@ -263,7 +263,7 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data) @@ -70 +53 @@ -index 4cea16a817..8efde4645a 100644 +index d65f47c181..d91633a2da 100644 @@ -83 +66 @@ -index 66d1966f29..1ce260c89b 100644 +index bce3dab68c..6a976ce5e8 100644 @@ -96 +79 @@ -index dac4cbee86..ed8cc695fe 100644 +index e60257e190..6633d6b42e 100644 @@ -99 +82 @@ -@@ -4077,7 +4077,7 @@ ecore_iov_execute_vf_flr_cleanup(struct ecore_hwfn *p_hwfn, +@@ -4075,7 +4075,7 @@ ecore_iov_execute_vf_flr_cleanup(struct ecore_hwfn *p_hwfn,