From: "Tu, Lijuan" <lijuan.tu@intel.com>
To: "Mo, YufengX" <yufengx.mo@intel.com>,
"dts@dpdk.org" <dts@dpdk.org>,
"Yao, Lei A" <lei.a.yao@intel.com>
Cc: "Mo, YufengX" <yufengx.mo@intel.com>
Subject: Re: [dts] [PATCH V2 8/8] conf: power suite series support meson
Date: Wed, 23 Sep 2020 08:57:48 +0000 [thread overview]
Message-ID: <083ab75a1c2742589abaa77e59502154@intel.com> (raw)
In-Reply-To: <20200917010513.15783-9-yufengx.mo@intel.com>
CONFLICT (content): Merge conflict in conf/app_name.cfg
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of yufengmx
> Sent: 2020年9月17日 9:05
> To: dts@dpdk.org; Yao, Lei A <lei.a.yao@intel.com>
> Cc: Mo, YufengX <yufengx.mo@intel.com>
> Subject: [dts] [PATCH V2 8/8] conf: power suite series support meson
>
>
> support meson build.
>
> Signed-off-by: yufengmx <yufengx.mo@intel.com>
> ---
> conf/app_name.cfg | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> 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=target/examples/dpdk-hotplug_mp
> mp_server=target/examples/dpdk-mp_server
> simple_mp=target/examples/dpdk-simple_mp
> symmetric_mp=target/examples/dpdk-symmetric_mp
> +vm_power_manager=target/examples/dpdk-vm_power_manager
> +guest_cli=target/examples/dpdk-guest_cli
> +distributor=target/examples/dpdk-distributor
> [makefile]
> pdump=target/app/dpdk-pdump
> proc-info=target/app/dpdk-procinfo
> @@ -119,3 +122,7 @@
> hotplug_mp=examples/multi_process/hotplug_mp/build/app/hotplug_mp
>
> mp_server=examples/multi_process/client_server_mp/mp_server/build/app/mp
> _server
> simple_mp=examples/multi_process/simple_mp/build/app/simple_mp
>
> symmetric_mp=examples/multi_process/symmetric_mp/build/app/symmetric_
> mp
> +vm_power_manager=examples/vm_power_manager/build/vm_power_mgr
> +guest_cli=examples/vm_power_manager/guest_cli/build/guest_vm_power_m
> gr
> +distributor=examples/distributor/build/distributor_app
> +
> --
> 2.21.0
next prev parent reply other threads:[~2020-09-23 8:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 1:05 [dts] [PATCH V2 0/8] power: " yufengmx
2020-09-17 1:05 ` [dts] [PATCH V2 1/8] power_bidirection_channel: " yufengmx
2020-09-17 1:05 ` [dts] [PATCH V2 2/8] power_empty_poll: " yufengmx
2020-09-17 1:05 ` [dts] [PATCH V2 3/8] power_pbf: " yufengmx
2020-09-17 1:05 ` [dts] [PATCH V2 4/8] power_pstate: " yufengmx
2020-09-17 1:05 ` [dts] [PATCH V2 5/8] power_telemetry: " yufengmx
2020-09-17 1:05 ` [dts] [PATCH V2 6/8] vm_pw_mgmt_policy: " yufengmx
2020-09-17 1:05 ` [dts] [PATCH V2 7/8] malicious_driver_event_indication: " yufengmx
2020-09-17 1:05 ` [dts] [PATCH V2 8/8] conf: power suite series " yufengmx
2020-09-23 8:57 ` Tu, Lijuan [this message]
2020-09-17 1:13 ` [dts] [PATCH V2 0/8] power: " Mo, YufengX
2020-09-17 8:55 ` Ma, LihongX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=083ab75a1c2742589abaa77e59502154@intel.com \
--to=lijuan.tu@intel.com \
--cc=dts@dpdk.org \
--cc=lei.a.yao@intel.com \
--cc=yufengx.mo@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).