From: sys_stv@intel.com To: test-report@dpdk.org Subject: [dpdk-test-report] |FAILURE| pw(75083) [v2, 4/7] cmdline: add internal wrapper for vdprintf Date: 30 Jul 2020 14:29:38 -0700 Message-ID: <fecc85$ascnoc@orsmga001.jf.intel.com> (raw) [-- Attachment #1: Type: text/plain, Size: 1092 bytes --] Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/75083 _apply issues_ Submitter: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com> Date: 2020-07-30 21:06:48 Reply_mail: 20200730210652.14568-5-dmitry.kozliuk@gmail.com DPDK git baseline: Repo:dpdk, CommitID: 544f35c334e5c0b99b4d2f93ca6d38fb7e1299d6 * Repo: dpdk A lib/librte_eal/windows/include/netinet/in.h Falling back to patching base and 3-way merge... CONFLICT (modify/delete): lib/librte_eal/windows/include/netinet/in.h deleted in HEAD and modified in eal/windows: improve compatibility networking headers. Version eal/windows: improve compatibility networking headers of lib/librte_eal/windows/include/netinet/in.h left in tree. error: Failed to merge in the changes. Patch failed at 0005 eal/windows: improve compatibility networking headers 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:[~2020-07-30 21:29 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='fecc85$ascnoc@orsmga001.jf.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
automatic DPDK test reports This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/test-report/0 test-report/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 test-report test-report/ http://inbox.dpdk.org/test-report \ test-report@dpdk.org public-inbox-index test-report Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.test-report AGPL code for this site: git clone https://public-inbox.org/public-inbox.git