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 11238A0543 for ; Sat, 5 Nov 2022 18:12:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C56B40151; Sat, 5 Nov 2022 18:12:15 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 7613D400D5 for ; Sat, 5 Nov 2022 18:12:13 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id t25-20020a1c7719000000b003cfa34ea516so460865wmi.1 for ; Sat, 05 Nov 2022 10:12:13 -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=bkRd+lBedk+4wjjvA0JcIWa8YzKHyhZTHRHARXoVwlI=; b=abhskjjMtWRfGA5V5rCeBsL6DZtwuasxRlPW71c40MIc3G5mwk2NWKadU1nFV2+0cU 1JMPc1gATQ19/fB84yXFHi+InEqSZNqRv8bdg9ppJpaFXNeQArJPSfhMOtFpFznTgTL/ 6d5zbrqaBVT5Aoo9DvZ0CP7mJ5PJ09TYYGCPSLx2t0q9AWIuKJDXodctWNUCNZIY1Gxk y+YmSbypmmPaNSNbOGmRRPvYYCDKy9rVYPbINF60WW5FC2X9xibGS8j6W+5pjF8CBeq5 djtpWuY65VAs/RMlNkBPNkdtrF0evT8gf2UrpM/3OVX6jDUKZWgsEg+fvVtwa9MoA9Tw Y1VQ== 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=bkRd+lBedk+4wjjvA0JcIWa8YzKHyhZTHRHARXoVwlI=; b=yJljKhH3dvNU5c4EWP38qrEuZqupAbpWvGRT8+B6UuqLV0NYdzIsmMEjaqmLEcsu// +hZmMtXT8nUddAq39EHu+RnKmZ5Wjz9EaBCEEe3XN0pfZGPhrnPHhWwzhA66zExHjH7/ bzzQr0JO3wjgZUh0G+wPSE5ojji0VlAfvFPHqg7Lafm1ruihOV9qOjoHR20uk979vL3k JDzMsRzCgydu4lMg4fKdODU2tze+Y2WJorWf1JI876Cb1d0y2sNypNrgeZfgMXl/J3dv KK3Y++oORqAJgFBpfT3vxEJXoKi6F0DdRSCrseOqT+GhNeHBmTdu7HSMgs+s8iEO1PMl I+DA== X-Gm-Message-State: ACrzQf1PmOUfYyuEZYEYn4mZMcbD/spUTao4h/l0VvMD+ZhOtlbp1aXU hMsQ+CrToBE2e9iVa/f1CPF5QVklELs= X-Google-Smtp-Source: AMsMyM5ieCQM99HNvby8/Vir1NbIc2pHgwqyVrA27ehv28LJzCaiy1egQmMI00rA6e4BnsBvUAjttA== X-Received: by 2002:a05:600c:3488:b0:3cf:88b4:7394 with SMTP id a8-20020a05600c348800b003cf88b47394mr13632595wmq.75.1667668333164; Sat, 05 Nov 2022 10:12:13 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id v3-20020a1cac03000000b003c6f3e5ba42sm6316870wme.46.2022.11.05.10.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:12:12 -0700 (PDT) From: luca.boccassi@gmail.com To: Olivier Matz Cc: dpdk stable Subject: patch 'event/sw: fix log in self test' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:09 +0000 Message-Id: <20221105171146.1520039-10-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/5f065a858c3bcd309a00927a697dc000ae240131 Thanks. Luca Boccassi --- >From 5f065a858c3bcd309a00927a697dc000ae240131 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Wed, 19 Oct 2022 19:06:46 +0530 Subject: [PATCH] event/sw: fix log in self test [ upstream commit 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 ] The log should display the value, not the ID. Fixes: e21df4b062b5 ("test/eventdev: add SW xstats tests") Signed-off-by: Olivier Matz --- drivers/event/sw/sw_evdev_selftest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c index c2e1b8fd14..8de55016a4 100644 --- a/drivers/event/sw/sw_evdev_selftest.c +++ b/drivers/event/sw/sw_evdev_selftest.c @@ -1641,8 +1641,8 @@ xstats_id_reset_tests(struct test *t) } if (val != port_expected[i]) { printf("%d: %s value incorrect, expected %"PRIu64 - " got %d\n", __LINE__, port_names[i], - port_expected[i], id); + " got %" PRIu64 "\n", __LINE__, port_names[i], + port_expected[i], val); failed = 1; } /* reset to zero */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:09.599946144 +0000 +++ 0010-event-sw-fix-log-in-self-test.patch 2022-11-05 17:11:08.594940924 +0000 @@ -1 +1 @@ -From 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 Mon Sep 17 00:00:00 2001 +From 5f065a858c3bcd309a00927a697dc000ae240131 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -13,2 +14,2 @@ - drivers/event/sw/sw_evdev_selftest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + drivers/event/sw/sw_evdev_selftest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -17 +18 @@ -index 9f27d8a189..3aa8d76ca8 100644 +index c2e1b8fd14..8de55016a4 100644 @@ -20 +21,2 @@ -@@ -1640,7 +1640,7 @@ xstats_id_reset_tests(struct test *t) +@@ -1641,8 +1641,8 @@ xstats_id_reset_tests(struct test *t) + } @@ -22,4 +24,5 @@ - printf("%d: %s value incorrect, expected %" PRIu64 - " got %" PRIu64 "\n", -- __LINE__, port_names[i], port_expected[i], id); -+ __LINE__, port_names[i], port_expected[i], val); + printf("%d: %s value incorrect, expected %"PRIu64 +- " got %d\n", __LINE__, port_names[i], +- port_expected[i], id); ++ " got %" PRIu64 "\n", __LINE__, port_names[i], ++ port_expected[i], val);