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 CB007A0C47 for ; Tue, 10 Aug 2021 17:43:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C0A65411CC; Tue, 10 Aug 2021 17:43:29 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id EDBF04014F for ; Tue, 10 Aug 2021 17:43:28 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id D32173F338 for ; Tue, 10 Aug 2021 15:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610208; bh=knNzQiceHzGiTCYPD9aqEp1tP1E1oBO/3TU3W1HJq4w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KTsNbT9Y01ej/qbJ7PEhH1f6rQ4S7we6EI15fFFwYN3BJF5AzExYaBtqI7yBqcL4R ArT5TIwHLUqY1ZCoRy2J9putBPfob6VKKeMzA6msa9YUnUarjY28P7WrVh6cQ2uLVA EqU1Cen4ZImQnIKvNomFZrkkJzy5M8R3TEgt2abCTpVddGQ8gtfHEwzSIX7k39n2IM ju9AAECUSwakxCNSA/mgv5fC+waLFxb12uZy4HhIRXmcd/5qWBDpjYWQyuJNW+NlMg dIBj44TEx7IwNOQr6OeMm7Q9xuZVbL/rV7ALjugsC3BURubrQqijJGNhhCoH05qkJg FVu9C2sEx/0vQ== Received: by mail-ed1-f72.google.com with SMTP id b25-20020a05640202d9b02903be7281a80cso2392677edx.3 for ; Tue, 10 Aug 2021 08:43:28 -0700 (PDT) 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=knNzQiceHzGiTCYPD9aqEp1tP1E1oBO/3TU3W1HJq4w=; b=QwOIwcxRZp+EK6IGg5HzoH0Q0XQqvplIPdBka6lVDHEUT4gRWfejlg6WJFr23QD1y6 lRHIrf8DJRBAvdbH2rGNKo3NCLJqbhihxDSIZXEkhjz17RJ7GhUg2Z2kzof/uwtUxe4X g8Tx/HBGRlH6YuwEV9jrdhDDBK6dypGyPVFh+HIFd1qs9dJG/U2kC/pp0b4mN8i8DQvw fmEMZ/hAqfeJt8Wt4Rj077s5hZsUIG5UXao9Xit3WWSUwBrNiyfcTtr/XdGoZeICDwjt NfsYyI8R0764mq/JUOsDkOaaPdVrDM8b5GRPI4j1W75lLWsCu81EpNd/pimCsn0UMQUM RTEw== X-Gm-Message-State: AOAM532z+sC9rRSh1b0QQQHAec2QU9WLw6d8981w/MBU1LqutoR3mzYb 5SrV5nHrSAbJzHYlUWgelbXMV4FHeBB0ZXY7E8waQG1BoypNA7u8hPBEZFMSyQwG5tQpHRae2Sm W+M776HWqHSD38zmfrSMeoHhe X-Received: by 2002:a05:6402:26c1:: with SMTP id x1mr5659546edd.134.1628610208302; Tue, 10 Aug 2021 08:43:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyA/EF+VgEfS/1cBYIxXeIBP6fee0jzOLkD+hzmna/PhsfHLA4y6ZfhaR+NuMbxNG4mmss1zw== X-Received: by 2002:a05:6402:26c1:: with SMTP id x1mr5659525edd.134.1628610208140; Tue, 10 Aug 2021 08:43:28 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id v13sm6996976ejh.62.2021.08.10.08.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:27 -0700 (PDT) From: christian.ehrhardt@canonical.com To: David Marchand Cc: dpdk stable Date: Tue, 10 Aug 2021 17:39:39 +0200 Message-Id: <20210810154022.749358-59-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx/base: fix debug build with clang' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/69180666f1d05bc858f3651cb2619790a5807543 Thanks. Christian Ehrhardt --- >From 69180666f1d05bc858f3651cb2619790a5807543 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 9 Jul 2021 11:32:29 +0530 Subject: [PATCH] net/octeontx/base: fix debug build with clang [ upstream commit 5898abedeb847590ce3cf800e907c5035866e09b ] Remove conflicting declaration of this symbol. Fixes: d0d654986018 ("net/octeontx: support event Rx adapter") Signed-off-by: David Marchand --- drivers/net/octeontx/base/octeontx_pkivf.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/octeontx/base/octeontx_pkivf.h b/drivers/net/octeontx/base/octeontx_pkivf.h index d541dc3bd9..ae5ffadf49 100644 --- a/drivers/net/octeontx/base/octeontx_pkivf.h +++ b/drivers/net/octeontx/base/octeontx_pkivf.h @@ -346,7 +346,6 @@ int octeontx_pki_port_open(int port); int octeontx_pki_port_hash_config(int port, pki_hash_cfg_t *hash_cfg); int octeontx_pki_port_pktbuf_config(int port, pki_pktbuf_cfg_t *buf_cfg); int octeontx_pki_port_create_qos(int port, pki_qos_cfg_t *qos_cfg); -int octeontx_pki_port_close(int port); int octeontx_pki_port_errchk_config(int port, pki_errchk_cfg_t *cfg); #endif /* __OCTEONTX_PKI_H__ */ -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.330757172 +0200 +++ 0059-net-octeontx-base-fix-debug-build-with-clang.patch 2021-08-10 15:11:13.054638359 +0200 @@ -1 +1 @@ -From 5898abedeb847590ce3cf800e907c5035866e09b Mon Sep 17 00:00:00 2001 +From 69180666f1d05bc858f3651cb2619790a5807543 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5898abedeb847590ce3cf800e907c5035866e09b ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index d41eaa57ed..8c86841ea6 100644 +index d541dc3bd9..ae5ffadf49 100644 @@ -20 +21 @@ -@@ -362,7 +362,6 @@ int octeontx_pki_port_open(int port); +@@ -346,7 +346,6 @@ int octeontx_pki_port_open(int port); @@ -26,2 +27,2 @@ - int octeontx_pki_port_vlan_fltr_config(int port, - pki_port_vlan_filter_config_t *fltr_cfg); + + #endif /* __OCTEONTX_PKI_H__ */