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 71B72A04F0 for ; Tue, 10 Dec 2019 16:01:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 67A341B13C; Tue, 10 Dec 2019 16:01:48 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 0456E1BE9D for ; Tue, 10 Dec 2019 16:01:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990106; 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=j9eek8F7kTlNOynPpctgOIr+yvCgR3a23ln+BqCYW/U=; b=AdJGSXwytRxsAWo7KHQWsJmemyEzUa/V6ScVWL+/+N5PDdGhfp9XRwOd/4gW+ymMLyuDUb QGO8zM9Ftz6kpYmVpMnjgJf4kxxNj5TEdeU1R6hpPy5A6mBFBCss9utlZb/9PZdjr9HTbN NEWiYxtg6mPIOvbyUsBkP1JCKMI+ufo= 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-229-K_RMTrdtOJ-pagax7ntByw-1; Tue, 10 Dec 2019 10:01:40 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 88C2B800C75 for ; Tue, 10 Dec 2019 15:01:39 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 446AF5DE53; Tue, 10 Dec 2019 15:01:32 +0000 (UTC) From: Kevin Traynor To: Kevin Traynor Cc: David Marchand , dpdk stable Date: Tue, 10 Dec 2019 14:59:26 +0000 Message-Id: <20191210145937.32755-52-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: K_RMTrdtOJ-pagax7ntByw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'compress/octeontx: remove commented out code' has been queued to LTS release 18.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 LTS release 18.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 12/16/19. 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 rebasi= ng (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/73833c76bb80449c31= 92075ca0a24fa2e74968ab Thanks. Kevin. --- >From 73833c76bb80449c3192075ca0a24fa2e74968ab Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Wed, 6 Nov 2019 19:02:01 +0000 Subject: [PATCH] compress/octeontx: remove commented out code [ upstream commit 021a812e886b3ea29931cf17279b0a27899fd425 ] This code is commented out. Remove it. Fixes: 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD") Signed-off-by: Kevin Traynor Reviewed-by: David Marchand --- drivers/compress/octeontx/include/zip_regs.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/compress/octeontx/include/zip_regs.h b/drivers/compres= s/octeontx/include/zip_regs.h index 04c3d75e9..96e538bb7 100644 --- a/drivers/compress/octeontx/include/zip_regs.h +++ b/drivers/compress/octeontx/include/zip_regs.h @@ -37,5 +37,4 @@ typedef union { #endif /* Word 0 - End */ =09} s; -=09/* struct zip_vqx_ena_s cn; */ } zip_vqx_ena_t; =20 @@ -65,5 +64,4 @@ typedef union { #endif /* Word 0 - End */ =09} s; -=09/* struct zip_vqx_sbuf_addr_s cn; */ } zip_vqx_sbuf_addr_t; =20 @@ -85,5 +83,4 @@ typedef union { #endif /* Word 0 - End */ =09} s; -=09/* struct zip_quex_doorbell_s cn; */ } zip_quex_doorbell_t; =20 @@ -105,5 +102,4 @@ union zip_nptr_s { #endif /* Word 0 - End */ =09} s; -=09/* struct zip_nptr_s_s cn83xx; */ }; =20 @@ -198,5 +194,4 @@ union zip_inst_s { =09=09/** Beginning of file */ =09=09uint64_t bf : 1; -=09=09// uint64_t reserved_3_4 : 2; =09=09/** Comp/decomp operation */ =09=09uint64_t op : 2; @@ -211,5 +206,4 @@ union zip_inst_s { =09=09uint64_t dg : 1; =09=09uint64_t ds : 1; -=09=09//uint64_t reserved_3_4 : 2; =09=09uint64_t op : 2; =09=09uint64_t bf : 1; @@ -616,6 +610,4 @@ union zip_zres_s { #endif /* Word 7 - End */ =09} /** ZIP Result Structure */s; - -=09/* struct zip_zres_s_s cn83xx; */ }; =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:42.518837628 +0000 +++ 0052-compress-octeontx-remove-commented-out-code.patch=092019-12-10 14:= 49:39.087457115 +0000 @@ -1 +1 @@ -From 021a812e886b3ea29931cf17279b0a27899fd425 Mon Sep 17 00:00:00 2001 +From 73833c76bb80449c3192075ca0a24fa2e74968ab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 021a812e886b3ea29931cf17279b0a27899fd425 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org