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 18A8CA04DD for ; Wed, 18 Nov 2020 17:39:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4EB5FC940; Wed, 18 Nov 2020 17:38:41 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 2653EC8F8 for ; Wed, 18 Nov 2020 17:38:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717517; 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=Pl6T0z/64PHJ+1CCdFtd9PUiGlutuGfL+z3wnMAdA+s=; b=YoFhSGODgmsnxWbyaxBc1FCTVItDoPIAImAZ7TyFX4Fin/3eV4jo5iSaSb1DSzVS+qDwh6 0CaplScTtiIo6K2YD8N5I+pO8R7evSrMVMpvrwCsz+WilG0Zev/D0tNJWyIqrMlfYe13WS 7R3drtCbgJJXRL1uTu8LrZ/00s5N584= 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-297-OiBh120AOn6v3fdAVNth2w-1; Wed, 18 Nov 2020 11:38:31 -0500 X-MC-Unique: OiBh120AOn6v3fdAVNth2w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25E62CEC61; Wed, 18 Nov 2020 16:38:30 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C3355C1D7; Wed, 18 Nov 2020 16:38:28 +0000 (UTC) From: Kevin Traynor To: Luca Boccassi Cc: dpdk stable Date: Wed, 18 Nov 2020 16:35:56 +0000 Message-Id: <20201118163558.1101823-70-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'fix spellings that Lintian complains about' has been queued to LTS release 18.11.11 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.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 11/24/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/30bf2faf0ec61543e4c5dbcfcef0cde5da004850 Thanks. Kevin. --- >From 30bf2faf0ec61543e4c5dbcfcef0cde5da004850 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/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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 522322d3d7..51d5830cfa 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -260,5 +260,5 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data) 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: 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 @@ -785,5 +785,5 @@ s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u32 mask) */ 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; } diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c index cb85ffe40d..3de1c664b0 100644 --- a/drivers/net/netvsc/hn_rndis.c +++ b/drivers/net/netvsc/hn_rndis.c @@ -277,5 +277,5 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan, 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 748252a42f..64c93991bb 100644 --- a/drivers/net/qede/base/ecore_sriov.c +++ b/drivers/net/qede/base/ecore_sriov.c @@ -4010,5 +4010,5 @@ ecore_iov_execute_vf_flr_cleanup(struct ecore_hwfn *p_hwfn, 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 cdfbd4be7a..7edb4a3215 100644 --- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c +++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c @@ -40,5 +40,5 @@ 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.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:39.246413505 +0000 +++ 0070-fix-spellings-that-Lintian-complains-about.patch 2020-11-18 16:33:38.005215111 +0000 @@ -1 +1 @@ -From e8cff6142a2768983bb7950e5f2b0cc00dd59f33 Mon Sep 17 00:00:00 2001 +From 30bf2faf0ec61543e4c5dbcfcef0cde5da004850 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e8cff6142a2768983bb7950e5f2b0cc00dd59f33 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17,2 +17,0 @@ - app/test-fib/main.c | 4 ++-- - drivers/net/hns3/hns3_ethdev.h | 2 +- @@ -24 +23 @@ - 7 files changed, 8 insertions(+), 8 deletions(-) + 5 files changed, 5 insertions(+), 5 deletions(-) @@ -26,26 +24,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 -@@ -630,8 +630,8 @@ print_usage(void) - "[-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" -diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h -index 63e0c2fb36..4c40df1cbb 100644 ---- a/drivers/net/hns3/hns3_ethdev.h -+++ b/drivers/net/hns3/hns3_ethdev.h -@@ -170,5 +170,5 @@ 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; @@ -53 +26 @@ -index 6e6eef5a6a..c26b036b85 100644 +index 522322d3d7..51d5830cfa 100644 @@ -56 +29 @@ -@@ -261,5 +261,5 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data) +@@ -260,5 +260,5 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data) @@ -64 +37 @@ -index 4cea16a817..8efde4645a 100644 +index d65f47c181..d91633a2da 100644 @@ -75 +48 @@ -index 66d1966f29..1ce260c89b 100644 +index cb85ffe40d..3de1c664b0 100644 @@ -86 +59 @@ -index dac4cbee86..ed8cc695fe 100644 +index 748252a42f..64c93991bb 100644 @@ -89 +62 @@ -@@ -4078,5 +4078,5 @@ ecore_iov_execute_vf_flr_cleanup(struct ecore_hwfn *p_hwfn, +@@ -4010,5 +4010,5 @@ ecore_iov_execute_vf_flr_cleanup(struct ecore_hwfn *p_hwfn, @@ -97 +70 @@ -index acddefa33d..79b8446f8e 100644 +index cdfbd4be7a..7edb4a3215 100644