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 4D4FCA0543 for ; Sat, 5 Nov 2022 18:12:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 48D8942D1C; Sat, 5 Nov 2022 18:12:48 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id BD932400D5 for ; Sat, 5 Nov 2022 18:12:46 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id v1so10843170wrt.11 for ; Sat, 05 Nov 2022 10:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MNpXlFcvVtMryVfHHyvdjRepuKtWgr19H3JloHwbwXM=; b=cg8bIzdHpao8MVUoblLpmPWoeeerh7lZ4veBdRU7OFfln2rX9n+FJkbSx92OQd10e0 XtUsF3+kghWVbpnIjl6V8dI9GMVDcuCA/uuaTCaoRqlFodQD46hTptCMUMA68VWla8zi 6abPtnuzQ01MmQkUQlDfM1zLltBEyhyLm9SoyOs0HxJZ1DWFUL7KIo06Ujxqdy6yzGzw 7gj/Y/28w5L/h7ypwGvHxqaNpLerObl+/j3KGVkiErkH4KLyMhotrPHcDDUVAUoLV8bu wACbZk8S91ttZfwjLZpkfJJeoZ41hUkjMr2miueg7eQNWGIcD1nikfLPMu+N64na43uT 9XVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MNpXlFcvVtMryVfHHyvdjRepuKtWgr19H3JloHwbwXM=; b=0wKMygz4mOaWGrgOCqtckJAV54YnRpDu7qxWlJZnbKkCGQ1LqcBSLhLqWbBeHY4HIc vPnzAAIlWLJkeUi6SblOmEN/Sf4ee37+OQPNMn/et0uKK3BeARSjY3XhwytpOjxSFisI wnVrgTHR1PZLR4o8dRR/qDU2zm49MEWNP08GemPOQxac6aIR/Az//oTOEk9N75R47MHS 2xvQGnC9tozZfsYCbbhM1Aoqcv0dpJP1i8Q14pvq3Pg8SoSukUVNsQDJ0Ze66srt/7xd QTnODgme6Y7wNRhnxTR44oX+O+WvuElXMiFflM8dXonRHATLfiXFc9ozk+ZArIzCpSzU YqUA== X-Gm-Message-State: ACrzQf1q2aO0tP5+v8x7cRDcVwbqW2YDckYnaYhfeq5EaBo+GqFBo02s nyNuvazwzG3pi11am7PKuOGBZF73to8= X-Google-Smtp-Source: AMsMyM6mV7/GRikzc2etKwMY5fjobMcR7ZuOAU+HriK/bAeZfkEaXvD0aB5XL6mB0UKpdzQ0EKCRuQ== X-Received: by 2002:adf:ec0b:0:b0:236:d76e:273f with SMTP id x11-20020adfec0b000000b00236d76e273fmr19966605wrn.179.1667668366486; Sat, 05 Nov 2022 10:12:46 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id iv9-20020a05600c548900b003cf87623c16sm7174122wmb.4.2022.11.05.10.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:12:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Boyer Cc: dpdk stable Subject: patch 'net/ionic: fix adapter name for logging' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:18 +0000 Message-Id: <20221105171146.1520039-19-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.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 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/07/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/4c63cfccaa7e8105a73f9c4a72f67c9400da2279 Thanks. Luca Boccassi --- >From 4c63cfccaa7e8105a73f9c4a72f67c9400da2279 Mon Sep 17 00:00:00 2001 From: Andrew Boyer Date: Tue, 18 Oct 2022 12:40:58 -0700 Subject: [PATCH] net/ionic: fix adapter name for logging [ upstream commit d8fad46a3f7e1f96945ea5a509041eef93ada835 ] Otherwise the log messages will be garbled. Fixes: 4ae96cb88fa0 ("net/ionic: do minor logging fixups") Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_dev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c index 632ca10cf2..414d395f5a 100644 --- a/drivers/net/ionic/ionic_dev.c +++ b/drivers/net/ionic/ionic_dev.c @@ -55,7 +55,10 @@ ionic_dev_setup(struct ionic_adapter *adapter) ioread8(&idev->dev_info->fw_version[i]); adapter->fw_version[IONIC_DEVINFO_FWVERS_BUFLEN - 1] = '\0'; - IONIC_PRINT(DEBUG, "Firmware version: %s", adapter->fw_version); + adapter->name = adapter->pci_dev->device.name; + + IONIC_PRINT(DEBUG, "%s firmware version: %s", + adapter->name, adapter->fw_version); /* BAR1: doorbells */ bar++; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:10.344685572 +0000 +++ 0019-net-ionic-fix-adapter-name-for-logging.patch 2022-11-05 17:11:08.630941697 +0000 @@ -1 +1 @@ -From d8fad46a3f7e1f96945ea5a509041eef93ada835 Mon Sep 17 00:00:00 2001 +From 4c63cfccaa7e8105a73f9c4a72f67c9400da2279 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d8fad46a3f7e1f96945ea5a509041eef93ada835 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 43e9ca3de3..5439b99b2d 100644 +index 632ca10cf2..414d395f5a 100644