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 9A575A0C41 for ; Tue, 30 Nov 2021 17:40:40 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E4DF41177; Tue, 30 Nov 2021 17:40:40 +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 E7C3E410F7 for ; Tue, 30 Nov 2021 17:40:39 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 CC0F33F1B1 for ; Tue, 30 Nov 2021 16:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290439; bh=cX8kHZg6nJ7K0wQDiIJrmoRb40ab+WuqDPRoTkrf7yI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=dmgvnWBgrkiaAWuFVHpn61ZD7NPdReqvVaWZysBA6YEaNlLQTmZyzI52b2kMpu+j1 A9/bvxDbB8ILn3MUWLFEXe99UIsEYli3ihTXpsrOOfViMctzyuNpo52wPm1M7aBTas ubZCg8vPU8cUg6eohifm+npU1PDNKtKkQz7yw71ISIKzwTB2ISIRAf/3oDQ7RDuIBW o174sPlk35mlqrN0KYVrnh1LEmJg2seCUEi/EnsLff7ySJPt54Qe9YHSr8Y4eTwfh3 xGA/GvcJIe4fn+WMUO740ugEpJ3EUSUz2c9JISzRwH95Ysrgrc07iIUE74pGDK6v4G F17kte4fnlx5A== Received: by mail-ed1-f70.google.com with SMTP id d13-20020a056402516d00b003e7e67a8f93so17527291ede.0 for ; Tue, 30 Nov 2021 08:40:39 -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=cX8kHZg6nJ7K0wQDiIJrmoRb40ab+WuqDPRoTkrf7yI=; b=Ca5pn0dyuR/nMOUHe13HCzKxelQqrpQwx7p1ia7oxW8ik3KNXDTh9XPqyUKFrofo4u Tu38xO+IjMMvudP++6bq/xBFQl0B1MiOLpcK/wB5kYadi/cTiTBN+huJrdDnvrvDqY4O dxKdkFfPogCvyaf3b8hXtjB9KgdINHkusjniSOb8IVrbLjoj8SXCWTjUzsslan+0FdYq PyxpY4l88Ue/IzPnl7Xx1Ac5kveO+JAzqDJgz+m+lTHV1QEAY00AWzp3NI1l+RDeP3kF Z4XnbpNiIcRHjO+jmgjl4M1S1QR3H90zLpujT/ZK3wCOTPPoebq49w02HT6lSDWjfLOK pAOA== X-Gm-Message-State: AOAM530bNn66NMu6JpNvGfNAnMvcTJ9EnGmzi3D1m+YcUp+TszrtzLm9 6VaaXtP0IKOlHLxSd6Uy0GzSsCc2gb0WaloWIbMESaNoZVJyX52M5femL4Lof985ri0uKzKxVc8 Yi/3F5zzezzIp/hSAHq4CrbAw X-Received: by 2002:a05:6402:27c7:: with SMTP id c7mr157581ede.0.1638290439430; Tue, 30 Nov 2021 08:40:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAxWg5fSOJRXVzed2nwDbchURzxJk+Yuj7LEQV5qVrBvUI4BXAHSIm4zYHE4ZemK22qIxjbw== X-Received: by 2002:a05:6402:27c7:: with SMTP id c7mr157565ede.0.1638290439301; Tue, 30 Nov 2021 08:40:39 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id yd20sm9297785ejb.47.2021.11.30.08.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:40:38 -0800 (PST) From: christian.ehrhardt@canonical.com To: William Tu Cc: Haiyue Wang , dpdk stable Subject: patch 'doc: fix emulated device names in e1000 guide' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:51 +0100 Message-Id: <20211130163605.2460997-87-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-Type: text/plain; charset=UTF-8 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/ae332e0f3bcd4aa6d6863e6b903bc605facb2a0e Thanks. Christian Ehrhardt --- >From ae332e0f3bcd4aa6d6863e6b903bc605facb2a0e Mon Sep 17 00:00:00 2001 From: William Tu Date: Mon, 11 Oct 2021 11:55:40 -0700 Subject: [PATCH] doc: fix emulated device names in e1000 guide [ upstream commit d2e5ab2b42444cd7149823fbba29a1227fc2b5cb ] The device name should be 82574L Gigabit Ethernet Controller. The patch also remove a redundant "*". Fixes: fc1f2750a3ec ("doc: programmers guide") Signed-off-by: William Tu Acked-by: Haiyue Wang --- doc/guides/nics/e1000em.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/e1000em.rst b/doc/guides/nics/e1000em.rst index b6a2534e36..63c0b1b337 100644 --- a/doc/guides/nics/e1000em.rst +++ b/doc/guides/nics/e1000em.rst @@ -8,9 +8,9 @@ The DPDK EM poll mode driver supports the following emulated devices: * qemu-kvm emulated Intel® 82540EM Gigabit Ethernet Controller (qemu e1000 device) -* VMware* emulated Intel® 82545EM Gigabit Ethernet Controller +* VMware emulated Intel® 82545EM Gigabit Ethernet Controller -* VMware emulated Intel® 8274L Gigabit Ethernet Controller. +* VMware emulated Intel® 82574L Gigabit Ethernet Controller. Validated Hypervisors --------------------- -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:11.022619235 +0100 +++ 0087-doc-fix-emulated-device-names-in-e1000-guide.patch 2021-11-30 16:50:05.878874175 +0100 @@ -1 +1 @@ -From d2e5ab2b42444cd7149823fbba29a1227fc2b5cb Mon Sep 17 00:00:00 2001 +From ae332e0f3bcd4aa6d6863e6b903bc605facb2a0e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d2e5ab2b42444cd7149823fbba29a1227fc2b5cb ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 041c9a09a3..5e752a29e5 100644 +index b6a2534e36..63c0b1b337 100644