From: sys_stv@intel.com
To: test-report@dpdk.org
Subject: [dpdk-test-report] |FAILURE| pw(80394) eventdev: add PCI probe named convenience function
Date: 13 Oct 2020 01:44:07 -0700 [thread overview]
Message-ID: <def01d$8tl6en@fmsmga008-auth.fm.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/80394
_apply issues_
Submitter: Timothy McDaniel <timothy.mcdaniel@intel.com>
Date: 2020-10-12 19:01:24
Reply_mail: 1602529284-29232-1-git-send-email-timothy.mcdaniel@intel.com
DPDK git baseline:
Repo:dpdk-next-eventdev, CommitID: eb1d398ddc3df4a79328af16b9b93dd6ff57d2ec
Repo:dpdk, CommitID: 7cf3d07c3adcb015c303e4cdf2ef9712a65ce46d
* Repo: dpdk-next-eventdev
Auto-merging lib/librte_eventdev/rte_eventdev_version.map
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev_version.map
Auto-merging lib/librte_eventdev/rte_eventdev_pmd_pci.h
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: add PCI probe named convenience function
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
Auto-merging lib/librte_eventdev/rte_eventdev_version.map
CONFLICT (content): Merge conflict in lib/librte_eventdev/rte_eventdev_version.map
Auto-merging lib/librte_eventdev/rte_eventdev_pmd_pci.h
error: Failed to merge in the changes.
Patch failed at 0001 eventdev: add PCI probe named convenience function
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
next reply other threads:[~2020-10-13 8:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 8:44 sys_stv [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-12 19:21 sys_stv
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='def01d$8tl6en@fmsmga008-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).