-
-
Save lwaftr-igalia/3ec76f23a1ffbcd13d6aafe204a7448d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Host: Linux snabb1 4.4.80 x86_64 Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz | |
Image: lwaftr/snabb-test | |
Pull Request: #1233 | |
Target Head: 096d97827badcba73300b8e3a3c4a176c50241ee | |
Pull Request Head: 807f1edb0d986b83c4d2fb2aa4a95a9cc371861b | |
SNABB_PCI0=0000:81:00.0 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01) | |
SNABB_PCI1=0000:81:00.1 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01) | |
SNABB_PCI_INTEL0=0000:81:00.0 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01) | |
SNABB_PCI_INTEL1=0000:81:00.1 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01) | |
ERROR: Failed to build 1233 | |
From https://github.com/igalia/snabb authorized_keys CONTRIBUTING.md COPYING default.nix Dockerfile gcc-preinclude.h generate-version-lua.sh lib Makefile README.md release.nix snabb.png src tarball.nix [new ref] refs/pull/1233/head -> pr1233 Switched to branch 'pr1233' Removing src/lib/traceprof/traceprof.lua Removing src/lib/traceprof/traceprof.h Removing src/lib/traceprof/traceprof.c Auto-merging src/lib/ptree/ptree.lua CONFLICT (content): Merge conflict in src/lib/ptree/ptree.lua Removing src/jit/zone.lua Removing src/jit/vmdef.lua Removing src/jit/v.lua Removing src/jit/p.lua Removing src/jit/dump.lua Removing src/jit/dis_x86.lua Removing src/jit/dis_x64.lua Removing src/arch/sse2.c Removing src/arch/avx2.c Removing lib/luajit/src/xedkbuild.bat Removing lib/luajit/src/xb1build.bat Removing lib/luajit/src/vm_x86.dasc Removing lib/luajit/src/vm_ppc.dasc Removing lib/luajit/src/vm_mips64.dasc Removing lib/luajit/src/vm_mips.dasc Removing lib/luajit/src/vm_arm64.dasc Removing lib/luajit/src/vm_arm.dasc Removing lib/luajit/src/psvitabuild.bat Removing lib/luajit/src/ps4build.bat Removing lib/luajit/src/msvcbuild.bat Removing lib/luajit/src/ljamalg.c Removing lib/luajit/src/lj_vmevent.h Removing lib/luajit/src/lj_vmevent.c Removing lib/luajit/src/lj_target_ppc.h Removing lib/luajit/src/lj_target_mips.h Removing lib/luajit/src/lj_target_arm64.h Removing lib/luajit/src/lj_target_arm.h Removing lib/luajit/src/lj_profile.h Removing lib/luajit/src/lj_profile.c Removing lib/luajit/src/lj_emit_ppc.h Removing lib/luajit/src/lj_emit_mips.h Removing lib/luajit/src/lj_emit_arm64.h Removing lib/luajit/src/lj_emit_arm.h Removing lib/luajit/src/lj_asm_ppc.h Removing lib/luajit/src/lj_asm_mips.h Removing lib/luajit/src/lj_asm_arm64.h Removing lib/luajit/src/lj_asm_arm.h Removing lib/luajit/src/jit/zone.lua Removing lib/luajit/src/jit/v.lua Removing lib/luajit/src/jit/p.lua Removing lib/luajit/src/jit/dump.lua Removing lib/luajit/src/jit/dis_x86.lua Removing lib/luajit/src/jit/dis_x64.lua Removing lib/luajit/src/jit/dis_ppc.lua Removing lib/luajit/src/jit/dis_mipsel.lua Removing lib/luajit/src/jit/dis_mips64el.lua Removing lib/luajit/src/jit/dis_mips64.lua Removing lib/luajit/src/jit/dis_mips.lua Removing lib/luajit/src/jit/dis_arm64.lua Removing lib/luajit/src/jit/dis_arm.lua Removing lib/luajit/src/jit/.gitignore Removing lib/luajit/dynasm/dasm_ppc.lua Removing lib/luajit/dynasm/dasm_ppc.h Removing lib/luajit/dynasm/dasm_mips64.lua Removing lib/luajit/dynasm/dasm_mips.lua Removing lib/luajit/dynasm/dasm_mips.h Removing lib/luajit/dynasm/dasm_arm64.lua Removing lib/luajit/dynasm/dasm_arm64.h Removing lib/luajit/dynasm/dasm_arm.lua Removing lib/luajit/dynasm/dasm_arm.h Removing lib/luajit/doc/ext_profiler.html Removing lib/luajit/README Automatic merge failed; fix conflicts and then commit the result. | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment