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 0BED5A054F; Tue, 2 Mar 2021 03:20:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA9544014E; Tue, 2 Mar 2021 03:20:56 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 65F7E40142 for ; Tue, 2 Mar 2021 03:20:55 +0100 (CET) IronPort-SDR: EjmPC4gEIr5y2sijn9glZHIXW0vOBUKieUrfaf8l2ibIyvEeqkjIqV07F8o/uv/HBB8FZQE0h9 QwApOeuBRLpg== X-IronPort-AV: E=McAfee;i="6000,8403,9910"; a="165897859" X-IronPort-AV: E=Sophos;i="5.81,216,1610438400"; d="scan'208";a="165897859" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2021 18:20:54 -0800 IronPort-SDR: aVIRefMgFNymkVY1zdfMvYeq69ho2pnaBndg6qqFf13h1Pqn7A7RXtBlERkEqq7esil83tT0/c B78/RZSk8lHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,216,1610438400"; d="scan'208";a="373426112" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga007.fm.intel.com with ESMTP; 01 Mar 2021 18:20:54 -0800 Received: from shsmsx602.ccr.corp.intel.com (10.109.6.142) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 1 Mar 2021 18:20:53 -0800 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by SHSMSX602.ccr.corp.intel.com (10.109.6.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 2 Mar 2021 10:20:51 +0800 Received: from shsmsx601.ccr.corp.intel.com ([10.109.6.141]) by SHSMSX601.ccr.corp.intel.com ([10.109.6.141]) with mapi id 15.01.2106.002; Tue, 2 Mar 2021 10:20:51 +0800 From: "Tu, Lijuan" To: "Xu, HailinX" , "dts@dpdk.org" CC: "Fu, Qi" , "Xu, HailinX" Thread-Topic: [dts] [PATCH v1] test_plans/cvl_advanced_iavf_rss_gtpu:modify hierarchy Thread-Index: AQHXDmAZM/nmhyNBZUq4EZftcPpUg6pv+G4g Date: Tue, 2 Mar 2021 02:20:51 +0000 Message-ID: <987883358d2748d58410c30541098179@intel.com> References: <1614577651-74721-1-git-send-email-hailinx.xu@intel.com> In-Reply-To: <1614577651-74721-1-git-send-email-hailinx.xu@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH v1] test_plans/cvl_advanced_iavf_rss_gtpu:modify hierarchy X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" > modify hierarchy of test cases. >=20 > Signed-off-by: Hailin Xu Merge failed, please rework CONFLICT (content): Merge conflict in test_plans/cvl_advanced_iavf_rss_gtpu= _test_plan.rst error: Failed to merge in the changes.