From: "Tu, Lijuan" <lijuan.tu@intel.com>
To: "Xu, HailinX" <hailinx.xu@intel.com>, "dts@dpdk.org" <dts@dpdk.org>
Cc: "Fu, Qi" <qi.fu@intel.com>, "Xu, HailinX" <hailinx.xu@intel.com>
Subject: Re: [dts] [PATCH v1] test_plans/cvl_advanced_iavf_rss_gtpu:modify hierarchy
Date: Tue, 2 Mar 2021 02:20:51 +0000 [thread overview]
Message-ID: <987883358d2748d58410c30541098179@intel.com> (raw)
In-Reply-To: <1614577651-74721-1-git-send-email-hailinx.xu@intel.com>
> modify hierarchy of test cases.
>
> Signed-off-by: Hailin Xu <hailinx.xu@intel.com>
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.
prev parent reply other threads:[~2021-03-02 2:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 5:47 Hailin Xu
2021-03-01 6:07 ` Fu, Qi
2021-03-02 2:20 ` Tu, Lijuan [this message]
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=987883358d2748d58410c30541098179@intel.com \
--to=lijuan.tu@intel.com \
--cc=dts@dpdk.org \
--cc=hailinx.xu@intel.com \
--cc=qi.fu@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).