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 438ADA0C4C for ; Mon, 12 Jul 2021 15:15:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B5654069E; Mon, 12 Jul 2021 15:15:49 +0200 (CEST) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 9CB9640685 for ; Mon, 12 Jul 2021 15:15:45 +0200 (CEST) Received: by mail-wm1-f44.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso9773588wme.0 for ; Mon, 12 Jul 2021 06:15:45 -0700 (PDT) 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=wz2UPCZ6WLVARgtYQOu/oLbpaFAWCAXazxnK7EJMQYA=; b=AWPdU/OdjIa9b+fYQ9gspv7p8II388H4s35jgPkEhKpzK8Do99wxAnv6VypepdAYkW AQDgZQGcDnuNuDkBu7wwaXVWIgH+bCY1RCpM2Ve3ZRYweFgU4ft3FSX7ZaFR29ZpZJa7 W80BHdoN78IyJAZnitC0iON8Ti57KBPnzdYaV2lQejKpILvePB9qLoRWA+7KlomiWPXE eJEDHZauj6usWZt/HZc5osjxIoRvIYnVUXowdmpCPhCEYJ4rVaO5xTi9LaFX5uP1d91d cCdquLxhjCKlzDRwAnKlGExVD8VSdSdLZrqdKft1xeOoEuDVAuTdxDjHtCPypXWK1qm4 AKxA== 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=wz2UPCZ6WLVARgtYQOu/oLbpaFAWCAXazxnK7EJMQYA=; b=OPWG8/8ib/5xspeFCEHirx1rVgZzW+RzTiLVr01jI36AzfKzi/tWJLz/2jWTeDO+8r CbNin95hR75pVjCrskF18vEHLbKEXt9unpZvItoJ2w3ihvUsC/D9JVgnhiBGLu+ilHKi gvJCLNDLuuJxTA3PRR0Jer9titUtfyAtZfhWc9mesd9bii+FL/zUJOjYhv7fKtXi48gd KA2B7aQwMFJ+fPrlyf2D1vUtLvyrW1ZwFA/tInqnseYDtrGxgQeRZrrZfxVaE7+eiLcv xsH6U9/NkXkWew8ocDS0vw4hzph26rZs/GMhAg2+wvh6uxFW2UvMj0xdqnN/3nuBTnpV SpHw== X-Gm-Message-State: AOAM532tGiiyQurKPJZsWnBthxrgOl33Jp2PQTg1lxsDjl19ubdo7UtD VwbeP4ERBjISfVzRXAEv1v0= X-Google-Smtp-Source: ABdhPJyWqUQ3OUuRFTCRS4E8FUU+GthNTA7I1/A3Wn4Pu9SmR/vYI4V+n1Y6I8F9WxCwbhKvUuTttw== X-Received: by 2002:a05:600c:8a9:: with SMTP id l41mr32636929wmp.161.1626095745449; Mon, 12 Jul 2021 06:15:45 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id w3sm19647911wmi.24.2021.07.12.06.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:15:44 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: dpdk stable Date: Mon, 12 Jul 2021 14:05:42 +0100 Message-Id: <20210712130551.2462159-107-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.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 20.11.3 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/5a66492539db2de630dc4d977c89edbfbe9ca4af Thanks. Luca Boccassi --- >From 5a66492539db2de630dc4d977c89edbfbe9ca4af 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 d41eaa57ed..8c86841ea6 100644 --- a/drivers/net/octeontx/base/octeontx_pkivf.h +++ b/drivers/net/octeontx/base/octeontx_pkivf.h @@ -362,7 +362,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); int octeontx_pki_port_vlan_fltr_config(int port, pki_port_vlan_filter_config_t *fltr_cfg); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:42.172657957 +0100 +++ 0107-net-octeontx-base-fix-debug-build-with-clang.patch 2021-07-12 13:41:36.914131443 +0100 @@ -1 +1 @@ -From 5898abedeb847590ce3cf800e907c5035866e09b Mon Sep 17 00:00:00 2001 +From 5a66492539db2de630dc4d977c89edbfbe9ca4af Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5898abedeb847590ce3cf800e907c5035866e09b ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org