automatic DPDK test reports
 help / color / mirror / Atom feed
From: sys_stv@intel.com
To: test-report@dpdk.org
Subject: [dpdk-test-report] |FAILURE| pw(86394) [v3, 3/3] net/ice: refactor PTYPE parsing
Date: 12 Jan 2021 12:31:09 -0800	[thread overview]
Message-ID: <93cfb9$h1ablf@fmsmga005-auth.fm.intel.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]


Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/86394

_apply issues_

Submitter: Jeff Guo <jia.guo@intel.com>
Date: 2021-01-12 09:32:43
Reply_mail: 20210112093243.40840-4-jia.guo@intel.com

DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 251c17cb7d6692ccefa047a46e81e253360165c1
	Repo:dpdk, CommitID: b1fd151267e6791a7649090c185413293549d033


* Repo: dpdk-next-net-intel
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ice/base/ice_flex_pipe.c
CONFLICT (content): Merge conflict in drivers/net/ice/base/ice_flex_pipe.c
error: Failed to merge in the changes.
Patch failed at 0001 net/ice/base: add package PTYPE enable information
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ice/base/ice_flex_pipe.c
CONFLICT (content): Merge conflict in drivers/net/ice/base/ice_flex_pipe.c
error: Failed to merge in the changes.
Patch failed at 0001 net/ice/base: add package PTYPE enable information
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
DPDK STV team

                 reply	other threads:[~2021-01-12 20:31 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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='93cfb9$h1ablf@fmsmga005-auth.fm.intel.com' \
    --to=sys_stv@intel.com \
    --cc=test-report@dpdk.org \
    /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).