From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8BCC6A0613 for ; Tue, 27 Aug 2019 11:32:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7DBA71C0B2; Tue, 27 Aug 2019 11:32:03 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0701B1C0BD for ; Tue, 27 Aug 2019 11:32:02 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C20410F23EB; Tue, 27 Aug 2019 09:32:01 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0C7E5C1B2; Tue, 27 Aug 2019 09:32:00 +0000 (UTC) From: Kevin Traynor To: Haiyue Wang Cc: dpdk stable Date: Tue, 27 Aug 2019 10:30:31 +0100 Message-Id: <20190827093032.20423-54-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 27 Aug 2019 09:32:01 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/tep_term: remove duplicate definitions' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/2ad789e9998f90d224e6baf9ec21ab25cc272c96 Thanks. Kevin Traynor --- >From 2ad789e9998f90d224e6baf9ec21ab25cc272c96 Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Wed, 17 Jul 2019 01:04:07 +0800 Subject: [PATCH] examples/tep_term: remove duplicate definitions [ upstream commit faa4ee75364dcb5343790d5fcf850cebdf7353f6 ] The state of virtio device has been defined in both header file and source file, keep the definition in header file for public use. Fixes: a50245ede72a ("examples/tep_term: initialize VXLAN sample") Signed-off-by: Haiyue Wang --- examples/tep_termination/main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c index d6379e31e..6db604ed8 100644 --- a/examples/tep_termination/main.c +++ b/examples/tep_termination/main.c @@ -53,9 +53,4 @@ #define JUMBO_FRAME_MAX_SIZE 0x2600 -/* State of virtio device. */ -#define DEVICE_MAC_LEARNING 0 -#define DEVICE_RX 1 -#define DEVICE_SAFE_REMOVE 2 - /* Config_core_flag status definitions. */ #define REQUEST_DEV_REMOVAL 1 -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:13.862689136 +0100 +++ 0054-examples-tep_term-remove-duplicate-definitions.patch 2019-08-27 09:40:10.964143320 +0100 @@ -1 +1 @@ -From faa4ee75364dcb5343790d5fcf850cebdf7353f6 Mon Sep 17 00:00:00 2001 +From 2ad789e9998f90d224e6baf9ec21ab25cc272c96 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit faa4ee75364dcb5343790d5fcf850cebdf7353f6 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 9d8ab17dd..ab956ad7c 100644 +index d6379e31e..6db604ed8 100644