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 78CDFA04B1; Wed, 23 Sep 2020 10:57:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7333E1DB93; Wed, 23 Sep 2020 10:57:54 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id B16761DAAD for ; Wed, 23 Sep 2020 10:57:52 +0200 (CEST) IronPort-SDR: VsodcvCanC3ScvM6h0DalyswEF7iDMq/uRHk0IgtAHQNeC3XP3ceL5ka6rqdf+U1rq7uMGgF8s QFUkJsF5ewxw== X-IronPort-AV: E=McAfee;i="6000,8403,9752"; a="245671063" X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="245671063" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 01:57:51 -0700 IronPort-SDR: kADO0n3oyAKra7KEIU/Zx9RBt7WX0Y5tVvOF91rprSUEt8QzKjstdjYjhfdrIgsllxxK0v07cL WUExPW1QIYQw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="454823067" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga004.jf.intel.com with ESMTP; 23 Sep 2020 01:57:51 -0700 Received: from shsmsx606.ccr.corp.intel.com (10.109.6.216) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 23 Sep 2020 01:57:50 -0700 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by SHSMSX606.ccr.corp.intel.com (10.109.6.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 23 Sep 2020 16:57:48 +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.1713.004; Wed, 23 Sep 2020 16:57:48 +0800 From: "Tu, Lijuan" To: "Mo, YufengX" , "dts@dpdk.org" , "Yao, Lei A" CC: "Mo, YufengX" Thread-Topic: [dts] [PATCH V2 8/8] conf: power suite series support meson Thread-Index: AQHWjI8sG29wqIKLekmwX0HRN+1sS6l19fZA Date: Wed, 23 Sep 2020 08:57:48 +0000 Message-ID: <083ab75a1c2742589abaa77e59502154@intel.com> References: <20200917010513.15783-1-yufengx.mo@intel.com> <20200917010513.15783-9-yufengx.mo@intel.com> In-Reply-To: <20200917010513.15783-9-yufengx.mo@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="iso-2022-jp" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V2 8/8] conf: power suite series support meson X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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" CONFLICT (content): Merge conflict in conf/app_name.cfg > -----Original Message----- > From: dts On Behalf Of yufengmx > Sent: 2020=1B$BG/=1B(B9=1B$B7n=1B(B17=1B$BF|=1B(B 9:05 > To: dts@dpdk.org; Yao, Lei A > Cc: Mo, YufengX > Subject: [dts] [PATCH V2 8/8] conf: power suite series support meson >=20 >=20 > support meson build. >=20 > Signed-off-by: yufengmx > --- > conf/app_name.cfg | 7 +++++++ > 1 file changed, 7 insertions(+) >=20 > diff --git a/conf/app_name.cfg b/conf/app_name.cfg index ff58137..c283c03 > 100644 > --- a/conf/app_name.cfg > +++ b/conf/app_name.cfg > @@ -62,6 +62,9 @@ hotplug_mp=3Dtarget/examples/dpdk-hotplug_mp > mp_server=3Dtarget/examples/dpdk-mp_server > simple_mp=3Dtarget/examples/dpdk-simple_mp > symmetric_mp=3Dtarget/examples/dpdk-symmetric_mp > +vm_power_manager=3Dtarget/examples/dpdk-vm_power_manager > +guest_cli=3Dtarget/examples/dpdk-guest_cli > +distributor=3Dtarget/examples/dpdk-distributor > [makefile] > pdump=3Dtarget/app/dpdk-pdump > proc-info=3Dtarget/app/dpdk-procinfo > @@ -119,3 +122,7 @@ > hotplug_mp=3Dexamples/multi_process/hotplug_mp/build/app/hotplug_mp >=20 > mp_server=3Dexamples/multi_process/client_server_mp/mp_server/build/app/m= p > _server > simple_mp=3Dexamples/multi_process/simple_mp/build/app/simple_mp >=20 > symmetric_mp=3Dexamples/multi_process/symmetric_mp/build/app/symmetric_ > mp > +vm_power_manager=3Dexamples/vm_power_manager/build/vm_power_mgr > +guest_cli=3Dexamples/vm_power_manager/guest_cli/build/guest_vm_power_m > gr > +distributor=3Dexamples/distributor/build/distributor_app > + > -- > 2.21.0