log

Host: Linux snabb1 3.18.24 x86_64 Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
Image: eugeneia/snabb-nfv-test
Pull Request: #176
Current Head: a87632fcac922415cbfcec763a86b53d9a7ebc99
Pull Request Head: 2fc51b6dc6620c0ebae168b2e4eceb6c9d475999

ERROR: Failed to build 176
From https://github.com/igalia/snabbswitch
 * [new ref]         refs/pull/176/head -> pr176
Switched to branch 'pr176'
Removing src/scripts/snabb_bot/tasks/test.sh
Removing src/scripts/snabb_bot/tasks/benchmarks.sh
Removing src/scripts/snabb_bot/snabb_bot.sh
Removing src/scripts/snabb_bot/bot_conf.sh.example
Removing src/scripts/snabb_bot/README.md
Removing src/scripts/cperf/cperf.sh
Removing src/scripts/cperf/benchmarks/packetblaster-64
Removing src/scripts/cperf/benchmarks/nfvconfig-template
Removing src/scripts/cperf/benchmarks/loadgen-snabb-nic-guest
Removing src/scripts/cperf/benchmarks/iperf-jumbo
Removing src/scripts/cperf/benchmarks/iperf-1500
Removing src/scripts/cperf/benchmarks/basic1-10e6
Removing src/scripts/cperf/README.md
Removing src/program/packetblaster/selftest.pcap
Removing src/lib/tuntap/tuntap.h
Removing src/lib/tuntap/tuntap.c
Removing src/lib/raw/raw.h
Removing src/lib/raw/raw.c
Removing src/lib/protocol/gre_key.lua
Removing src/lib/protocol/gre_csum_key.lua
Removing src/lib/protocol/gre_csum.lua
Auto-merging src/lib/checksum.lua
Auto-merging src/dynasm.lua
Auto-merging src/dasm_x86.lua
CONFLICT (content): Merge conflict in src/dasm_x86.lua
Auto-merging src/dasm_x86.h
CONFLICT (content): Merge conflict in src/dasm_x86.h
Auto-merging src/dasm_x64.lua
Auto-merging src/dasm.lua
Auto-merging src/core/main.lua
CONFLICT (content): Merge conflict in src/core/main.lua
Removing src/apps/socket/io.h
Removing src/apps/socket/io.c
Removing src/apps/socket/dev.lua
Auto-merging src/apps/lwaftr/test_phm_streaming_lookup.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/test_phm_streaming_lookup.lua
Auto-merging src/apps/lwaftr/test_phm_lookup.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/test_phm_lookup.lua
Auto-merging src/apps/lwaftr/test_phm_create.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/test_phm_create.lua
Auto-merging src/apps/lwaftr/rangemap.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/rangemap.lua
Auto-merging src/apps/lwaftr/podhashmap.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/podhashmap.lua
Auto-merging src/apps/lwaftr/multi_copy.dasl
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/multi_copy.dasl
Auto-merging src/apps/lwaftr/lwutil.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/lwutil.lua
Auto-merging src/apps/lwaftr/lwheader.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/lwheader.lua
Auto-merging src/apps/lwaftr/lwdebug.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/lwdebug.lua
Auto-merging src/apps/lwaftr/lwaftr.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/lwaftr.lua
Auto-merging src/apps/lwaftr/icmp.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/icmp.lua
Auto-merging src/apps/lwaftr/fragmentv6.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/fragmentv6.lua
Auto-merging src/apps/lwaftr/fragmentv4_test.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/fragmentv4_test.lua
Auto-merging src/apps/lwaftr/fragmentv4.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/fragmentv4.lua
Auto-merging src/apps/lwaftr/dump.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/dump.lua
Auto-merging src/apps/lwaftr/constants.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/constants.lua
Auto-merging src/apps/lwaftr/conf.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/conf.lua
Auto-merging src/apps/lwaftr/binding_table.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/binding_table.lua
Auto-merging src/apps/lwaftr/binary_search.dasl
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/binary_search.dasl
Auto-merging src/apps/lwaftr/benchmark.lua
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/benchmark.lua
Auto-merging src/Makefile
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging .travis.yml
CONFLICT (add/add): Merge conflict in .travis.yml
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result.