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 A2876A034C for ; Fri, 25 Feb 2022 18:17:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E98E4114D; Fri, 25 Feb 2022 18:17:13 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 81FD3410FD for ; Fri, 25 Feb 2022 18:17:12 +0100 (CET) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (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-internal-0.canonical.com (Postfix) with ESMTPS id 63C563FCA6 for ; Fri, 25 Feb 2022 17:17:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809432; bh=GxR92ZkCFsHjA7Hd7wU+/z5q1TARY19zhfDWHGSMgtU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VUCEOh2qY7ToHm95gKnPE7RmVaf26iTTxbOF/eYwi6cmfKnOzc1DgJa6riDJl9/7d J0QOpIDwtjVYMPUwKxAKuuATKVEZwZwY8CZwe3Q2yNSTfhHIUzQaS9WpQ929sc6pt0 2KMI9BnkYNNqMFQ/Pd8BeWaqX0QllHAmY3yCdIqq8dpyOXAQCwSAqTmL439V5/wLpY w7uf4WMgWMzG97F6fbs2MeEoY1ZNc5hEjwUfjG3JKcYc4JkVf2oIwBfO2vDCg6UIO9 ODXPapFztzn4RVxASNHntgbqBU9bvZiXtP2gYX5I17yDCaTzKbyn/DyB3KstefpPgS 8iXS7w6VapESg== Received: by mail-wm1-f71.google.com with SMTP id v125-20020a1cac83000000b0037e3d70e7e1so1846763wme.1 for ; Fri, 25 Feb 2022 09:17:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GxR92ZkCFsHjA7Hd7wU+/z5q1TARY19zhfDWHGSMgtU=; b=GNa7kUWIhFz0VrgO/ATGKqhaOuGTK20GKT5yki7RaDtaeXMVtCJaLZDr1VLaBxbKDr hJuZmZF7FsLR5SaOL1jDXjububk92xFXii5gLCcEVxF5yVRShK67dsmathNPYxHgO58j DdiZfD4JSWtbs2Uq/VAoYWWWZDlDqf+RF/nTSgRPI2Zrm2I9jc9K4e9s0i/ksRuvEAqC y7mwEcnvUc/CS4E3udQmF0g/VNwQxCgJveNeBlELAmEyMhUIURfKh51WZdjzd6BsLX6p 2IFEILyhm5gDhi2m3Orik0IB/bw17to7TY6nxnpRUBoqxqBO1lcYEuGx6Jkrqpw895MG uJVQ== X-Gm-Message-State: AOAM531tBRkFhCfxl7jqm3QL4ghDOJ8H1Wu0wA6wa3irBFt11wCf7MIH yyK2cMM+UmrcH2KQ2bXhJI46piQbDocSzDUOlYTZzb2ecGdqdGS6vdmwUEgCRwUZvVQnfxF6cec 1KP9c4rvCLi8bJUIAWGCJMTDB X-Received: by 2002:adf:ebd0:0:b0:1e3:f9b:7b77 with SMTP id v16-20020adfebd0000000b001e30f9b7b77mr6600236wrn.691.1645809431720; Fri, 25 Feb 2022 09:17:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQfyAp4FXF2rjSxByGL+FXR6wA/iAf6sUnY551zrW/PzcV1ZDg/1yIAiguEstZ6IsjCnBB3Q== X-Received: by 2002:adf:ebd0:0:b0:1e3:f9b:7b77 with SMTP id v16-20020adfebd0000000b001e30f9b7b77mr6600223wrn.691.1645809431501; Fri, 25 Feb 2022 09:17:11 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id t8-20020a5d6908000000b001e3169cc6afsm2823779wru.94.2022.02.25.09.17.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:11 -0800 (PST) From: christian.ehrhardt@canonical.com To: Andy Pei Cc: Chenbo Xia , dpdk stable Subject: patch 'vdpa/ifc: fix log info mismatch' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:20 +0100 Message-Id: <20220225171550.3499040-27-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/3c97e0b5fc0488b73ed23f33b35b1605d624a6e9 Thanks. Christian Ehrhardt --- >From 3c97e0b5fc0488b73ed23f33b35b1605d624a6e9 Mon Sep 17 00:00:00 2001 From: Andy Pei Date: Mon, 13 Dec 2021 15:00:40 +0800 Subject: [PATCH] vdpa/ifc: fix log info mismatch [ upstream commit 527ec438eb31d4d821624f74d7dfd3b0bcc1c28e ] Fix log info mismatch. Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver") Signed-off-by: Andy Pei Reviewed-by: Chenbo Xia --- drivers/net/ifc/base/ifcvf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifc/base/ifcvf.c index 721cb1da8a..d10c1fd6a4 100644 --- a/drivers/net/ifc/base/ifcvf.c +++ b/drivers/net/ifc/base/ifcvf.c @@ -94,12 +94,14 @@ next: return -1; } - DEBUGOUT("capability mapping:\ncommon cfg: %p\n" - "notify base: %p\nisr cfg: %p\ndevice cfg: %p\n" - "multiplier: %u\n", - hw->common_cfg, hw->dev_cfg, - hw->isr, hw->notify_base, - hw->notify_off_multiplier); + DEBUGOUT("capability mapping:\n" + "common cfg: %p\n" + "notify base: %p\n" + "isr cfg: %p\n" + "device cfg: %p\n" + "multiplier: %u\n", + hw->common_cfg, hw->notify_base, hw->isr, hw->dev_cfg, + hw->notify_off_multiplier); return 0; } -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.322284117 +0100 +++ 0027-vdpa-ifc-fix-log-info-mismatch.patch 2022-02-25 16:58:44.236990409 +0100 @@ -1 +1 @@ -From 527ec438eb31d4d821624f74d7dfd3b0bcc1c28e Mon Sep 17 00:00:00 2001 +From 3c97e0b5fc0488b73ed23f33b35b1605d624a6e9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 527ec438eb31d4d821624f74d7dfd3b0bcc1c28e ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - drivers/vdpa/ifc/base/ifcvf.c | 14 ++++++++------ + drivers/net/ifc/base/ifcvf.c | 14 ++++++++------ @@ -17 +18 @@ -diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c +diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifc/base/ifcvf.c @@ -19,2 +20,2 @@ ---- a/drivers/vdpa/ifc/base/ifcvf.c -+++ b/drivers/vdpa/ifc/base/ifcvf.c +--- a/drivers/net/ifc/base/ifcvf.c ++++ b/drivers/net/ifc/base/ifcvf.c