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 26823A034E for ; Mon, 21 Feb 2022 16:38:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20139410F7; Mon, 21 Feb 2022 16:38:05 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B507B4013F for ; Mon, 21 Feb 2022 16:38:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457883; 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=bCanb5933lRFtFXywXApMZLQJEnP/QEbzQEyWSrujVc=; b=YZEHOwjctkRjne5btioZvyJrR5AOQKT1cCGKtGz2n3srzqpOry/AlzsEi3tKy+/L2DNucL YlZfBcPCwEQG2EaVCW03WRc5CEbkFb40Df33nL+P1B5VLpYQlXJ5aF0+qDUUTc93Unh1ql BXcpfS6J6qA17rA1TLRVtgGJeyKn7/c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-yOVuAefUMUKiHFyqCXsv0g-1; Mon, 21 Feb 2022 10:38:00 -0500 X-MC-Unique: yOVuAefUMUKiHFyqCXsv0g-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 EEBF0180FD60; Mon, 21 Feb 2022 15:37:58 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1B4C7E2E8; Mon, 21 Feb 2022 15:37:57 +0000 (UTC) From: Kevin Traynor To: Haiyue Wang Cc: Beilei Xing , Radu Nicolau , dpdk stable Subject: patch 'net/iavf: remove git residue symbol' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:46 +0000 Message-Id: <20220221153625.152324-37-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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" 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 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/85e84c5930e20d1d9ea1e2df47c2be37301a05fc Thanks. Kevin --- >From 85e84c5930e20d1d9ea1e2df47c2be37301a05fc Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Thu, 16 Dec 2021 12:43:42 +0800 Subject: [PATCH] net/iavf: remove git residue symbol [ upstream commit 9b8b48f43bc53f819315f38c8a78cbeac8fb09e5 ] This extra symbol '+' should be added when patch was reapplied, and the compiler treats it as unsigned type, so the code still runs well. Fixes: 84108425054a ("net/iavf: support asynchronous virtual channel message") Signed-off-by: Haiyue Wang Acked-by: Beilei Xing Acked-by: Radu Nicolau --- drivers/net/iavf/iavf_vchnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 7602691649..169e1f2012 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -503,5 +503,5 @@ iavf_get_vf_resource(struct iavf_adapter *adapter) VIRTCHNL_VF_LARGE_NUM_QPAIRS | VIRTCHNL_VF_OFFLOAD_QOS | -+ VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO; + VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO; args.in_args = (uint8_t *)∩︀ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.458700226 +0000 +++ 0037-net-iavf-remove-git-residue-symbol.patch 2022-02-21 15:22:44.080704101 +0000 @@ -1 +1 @@ -From 9b8b48f43bc53f819315f38c8a78cbeac8fb09e5 Mon Sep 17 00:00:00 2001 +From 85e84c5930e20d1d9ea1e2df47c2be37301a05fc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9b8b48f43bc53f819315f38c8a78cbeac8fb09e5 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org