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 5A14CA0350 for ; Mon, 21 Feb 2022 16:40:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54963410F2; Mon, 21 Feb 2022 16:40:29 +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 309BB40DF6 for ; Mon, 21 Feb 2022 16:40:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458026; 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=o6D6oI2j7SvpCLcASaAs8flTkUtxtg+wVpuOrdpzWRk=; b=JaP1+jt8baqNtf++V7perkaugTW+bZE5Gp2vScy/NbRig/WmqGDwKFSXr3qckqSKNDATKX +5r/i5k45MovMqgSs0wQF23mlchNlNACVtEZdMQMdbxrHjfdOd0mFbyKM8ApaxaYNMFhQU hbJFUFXYQp15vYPFiTxhewcNtKpVai0= 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-609-S60pigXFOY2WxJoD7bMxeg-1; Mon, 21 Feb 2022 10:40:24 -0500 X-MC-Unique: S60pigXFOY2WxJoD7bMxeg-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 0E2A1100C662; Mon, 21 Feb 2022 15:40:23 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0259B7E131; Mon, 21 Feb 2022 15:40:21 +0000 (UTC) From: Kevin Traynor To: Andy Pei Cc: Chenbo Xia , dpdk stable Subject: patch 'vdpa/ifc: fix log info mismatch' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:58 +0000 Message-Id: <20220221153625.152324-109-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/efc7ea9dd77d2cb74ad14715617cd087e2c31329 Thanks. Kevin --- >From efc7ea9dd77d2cb74ad14715617cd087e2c31329 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/vdpa/ifc/base/ifcvf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c index 721cb1da8a..d10c1fd6a4 100644 --- a/drivers/vdpa/ifc/base/ifcvf.c +++ b/drivers/vdpa/ifc/base/ifcvf.c @@ -95,10 +95,12 @@ next: } - 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.970209890 +0000 +++ 0109-vdpa-ifc-fix-log-info-mismatch.patch 2022-02-21 15:22:44.215704405 +0000 @@ -1 +1 @@ -From 527ec438eb31d4d821624f74d7dfd3b0bcc1c28e Mon Sep 17 00:00:00 2001 +From efc7ea9dd77d2cb74ad14715617cd087e2c31329 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 527ec438eb31d4d821624f74d7dfd3b0bcc1c28e ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org