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 09B14A0C41 for ; Tue, 30 Nov 2021 17:41:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0A13410F7; Tue, 30 Nov 2021 17:41:12 +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 AE5C0410F7 for ; Tue, 30 Nov 2021 17:41:10 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.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 8308340035 for ; Tue, 30 Nov 2021 16:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290470; bh=pENSJmiY8KaYI1CHzCEFpuIGrU0XLEegymmhRTfe58o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HLkrfbrHnDEKYZPOUtz5Ru3Oseok8U9YE4UjWT4gFlUAGqGDdt3YDien221W4n3nQ dNrxaHdmftL/2XruIZU7E9AMlAmgYkCLKwSEjaTY9ErE8yTjshc5GSZ6VT+ulSOWt1 PC5g2XL553wtUrCLNhJ9mA/hpS6SidA7ocms2bMb0L70SNY0evoOUhlbDJlp5fLnW6 9wJZRnyg4QPQtPm7WtoL3RnwwPFHkKP8NQpkUhXT+T4HnyGmlgJTHn4RxWtV2IH4kY j/c4TQ+pnsUbwfbGehPvz4u+fmErwT0JRzZHZstFZOCS0ewVt2RlJ9sqGXW3aeCNcs POJTCqOp8Jq4w== Received: by mail-ed1-f71.google.com with SMTP id t9-20020aa7d709000000b003e83403a5cbso17495126edq.19 for ; Tue, 30 Nov 2021 08:41:10 -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=pENSJmiY8KaYI1CHzCEFpuIGrU0XLEegymmhRTfe58o=; b=v4WXZp3Q5auDqzobDtp0HlRnSHBU+DmYsBMqglTpLH0LQO83o/TXJMFx9vFWwnbJza R0wVtNd1aCTtDX9lTV94EK+eeAaLOi3xIvQtWp32ylVNhpRb2xxdFxQeYwwJQCsJOvV1 /Imvw5Oe9rfz6N+D20/q5j0UmwCz5/Z3EfXiE91juYi1/f4M92mx9bBvsV0koiOi8ULv iCiYCcNda8QoxYy9LsK9GFbKfTkTY5722tQcX92OKKqdTcQ93TwjO8z3bG0ECBbeiV+S S/z74yzuDDwwlV7pFgFJOXwSOD+z8q5fKO7ENqMEiQYimfTIO3LO5TPMk6Z7yXfvDj0q W+xA== X-Gm-Message-State: AOAM531UV8flfKdU+fEGF3GNprblsnDWHbSLGdFg/oaFpboa9uuXCxfj 5guMzAhn70UcG/hM3UhPmrmK2431tWA7WfbS2Fd1IyfTb23aqbYFMZIlvos8UplDv890d8ZpVnE LCauklYQv2pDRmmINddiA3PVV X-Received: by 2002:a17:906:b2c7:: with SMTP id cf7mr190465ejb.303.1638290470262; Tue, 30 Nov 2021 08:41:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwqR8S3HQwzGEip3yQBVcGr0/gC0Oa5LMZP0vsf5SLRQgpnPMwibQbvLt1tcSgxWNe350stw== X-Received: by 2002:a17:906:b2c7:: with SMTP id cf7mr190453ejb.303.1638290470108; Tue, 30 Nov 2021 08:41:10 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id kx3sm9154519ejc.112.2021.11.30.08.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:41:09 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Olivier Matz , dpdk stable Subject: patch 'doc: fix default mempool option in guides' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:01 +0100 Message-Id: <20211130163605.2460997-97-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/e856790c5fcb542781b24114176c76933a080b42 Thanks. Christian Ehrhardt --- >From e856790c5fcb542781b24114176c76933a080b42 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 15 Oct 2021 10:39:41 +0200 Subject: [PATCH] doc: fix default mempool option in guides [ upstream commit 65c2bbf41f2258fea8e1639a86598f48d8251756 ] This option should be prefixed with -- for consistency with others. Fixes: a103a97e7191 ("eal: allow user to override default mempool driver") Signed-off-by: David Marchand Reviewed-by: Olivier Matz --- doc/guides/freebsd_gsg/build_sample_apps.rst | 2 +- doc/guides/linux_gsg/build_sample_apps.rst | 2 +- doc/guides/linux_gsg/eal_args.include.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/freebsd_gsg/build_sample_apps.rst b/doc/guides/freebsd_gsg/build_sample_apps.rst index 0c1b9cb79f..bd3ec8a923 100644 --- a/doc/guides/freebsd_gsg/build_sample_apps.rst +++ b/doc/guides/freebsd_gsg/build_sample_apps.rst @@ -139,7 +139,7 @@ Other options, specific to Linux and are not supported under FreeBSD are as foll * ``--huge-dir``: The directory where hugetlbfs is mounted. -* ``mbuf-pool-ops-name``: +* ``--mbuf-pool-ops-name``: Pool ops name for mbuf to use. * ``--file-prefix``: diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 2c2f5faec5..8d2740b5f3 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -136,7 +136,7 @@ The EAL options are as follows: * ``--huge-dir``: The directory where hugetlbfs is mounted. -* ``mbuf-pool-ops-name``: +* ``--mbuf-pool-ops-name``: Pool ops name for mbuf to use. * ``--file-prefix``: diff --git a/doc/guides/linux_gsg/eal_args.include.rst b/doc/guides/linux_gsg/eal_args.include.rst index 7b2f6b1d43..56c19c9b00 100644 --- a/doc/guides/linux_gsg/eal_args.include.rst +++ b/doc/guides/linux_gsg/eal_args.include.rst @@ -147,6 +147,6 @@ Other options Display the version information on startup. -* ``mbuf-pool-ops-name``: +* ``--mbuf-pool-ops-name``: Pool ops name for mbuf to use. -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:11.509701229 +0100 +++ 0097-doc-fix-default-mempool-option-in-guides.patch 2021-11-30 16:50:05.894874293 +0100 @@ -1 +1 @@ -From 65c2bbf41f2258fea8e1639a86598f48d8251756 Mon Sep 17 00:00:00 2001 +From e856790c5fcb542781b24114176c76933a080b42 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 65c2bbf41f2258fea8e1639a86598f48d8251756 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 4fba671e4f..c87e982759 100644 +index 0c1b9cb79f..bd3ec8a923 100644 @@ -23 +24 @@ -@@ -88,7 +88,7 @@ Other options, specific to Linux and are not supported under FreeBSD are as foll +@@ -139,7 +139,7 @@ Other options, specific to Linux and are not supported under FreeBSD are as foll @@ -33 +34 @@ -index 709b301427..efd2dd23f1 100644 +index 2c2f5faec5..8d2740b5f3 100644 @@ -36 +37 @@ -@@ -82,7 +82,7 @@ The EAL options are as follows: +@@ -136,7 +136,7 @@ The EAL options are as follows: @@ -46 +47 @@ -index 96baa4a9b0..3549a0cf56 100644 +index 7b2f6b1d43..56c19c9b00 100644 @@ -49 +50 @@ -@@ -199,7 +199,7 @@ Other options +@@ -147,6 +147,6 @@ Other options @@ -57 +57,0 @@ -