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 9231041E9F for ; Wed, 15 Mar 2023 15:37:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8EFD142D29; Wed, 15 Mar 2023 15:37:28 +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 5684642B71 for ; Wed, 15 Mar 2023 15:37:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891046; 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=5e+E8ySCDphCo7p4P35xwwPhYLQDhmB+sC99n4Drq3c=; b=f6RcOetW3kbbGZjJ2K9LlOEms7lyKCPyIgaJq/meenmMBLrCl4kPJ/Nze+bqTEL0fv0sa4 YaTsMEUUbxEQRE4+9ySzwRrt/z1adbNKfIibiAWLzlj68MvUIgCe/ut+0um70/Z1K+lF04 Q70oXfKEgQ+bQc0v/t94AxEhW3IQCro= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-383-A0jEzTaFMBqJix6aZskKZA-1; Wed, 15 Mar 2023 10:37:23 -0400 X-MC-Unique: A0jEzTaFMBqJix6aZskKZA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBB31101A554; Wed, 15 Mar 2023 14:37:22 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2938040C6E67; Wed, 15 Mar 2023 14:37:21 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Chengwen Feng , dpdk stable Subject: patch 'cmdline: make rdline status not private' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:29 +0000 Message-Id: <20230315143640.677317-36-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/20/23. 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/42339a554e3c6ca4fa8a8782e4e9d611a2d22c99 Thanks. Kevin --- >From 42339a554e3c6ca4fa8a8782e4e9d611a2d22c99 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 3 Feb 2023 11:14:07 -0800 Subject: [PATCH] cmdline: make rdline status not private [ upstream commit 1ac8dd1d1b62c59cd440e5529e3bd5a500e72f76 ] The function cmdline_poll() returns values from rdline_status enum but that was moved to being defined only in cmdline_private.h. For proper use of the API the return value needs to be visible to callers. This was not a problem before because cmdline_poll() was not used anywhere. Fixes: f8f8dc289095 ("cmdline: make struct rdline opaque") Signed-off-by: Stephen Hemminger Acked-by: Chengwen Feng --- lib/cmdline/cmdline.h | 6 ++++++ lib/cmdline/cmdline_private.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h index 96674dfda2..b14355ef51 100644 --- a/lib/cmdline/cmdline.h +++ b/lib/cmdline/cmdline.h @@ -24,4 +24,10 @@ extern "C" { #endif +enum rdline_status { + RDLINE_INIT, + RDLINE_RUNNING, + RDLINE_EXITED +}; + struct cmdline; diff --git a/lib/cmdline/cmdline_private.h b/lib/cmdline/cmdline_private.h index c2e906d8de..a3271c7693 100644 --- a/lib/cmdline/cmdline_private.h +++ b/lib/cmdline/cmdline_private.h @@ -24,10 +24,4 @@ #define RDLINE_HISTORY_MAX_LINE 64 -enum rdline_status { - RDLINE_INIT, - RDLINE_RUNNING, - RDLINE_EXITED -}; - struct rdline { enum rdline_status status; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.468790230 +0000 +++ 0036-cmdline-make-rdline-status-not-private.patch 2023-03-15 14:30:20.606123773 +0000 @@ -1 +1 @@ -From 1ac8dd1d1b62c59cd440e5529e3bd5a500e72f76 Mon Sep 17 00:00:00 2001 +From 42339a554e3c6ca4fa8a8782e4e9d611a2d22c99 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1ac8dd1d1b62c59cd440e5529e3bd5a500e72f76 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org