mpire@linuxcnc:~/linuxcnc-eth$ git pull
remote: Counting objects: 461, done.
remote: Compressing objects: 100% (59/59), done.
remote: Total 284 (delta 231), reused 273 (delta 220)
Receiving objects: 100% (284/284), 40.10 KiB, done.
Resolving deltas: 100% (231/231), completed with 52 local objects.
From git://git.linuxcnc.org/git/linuxcnc
 + 2b89b5e...197bf22 jepler/rtos-uspace-hm2-eth -> origin/jepler/rtos-uspace-hm2-eth  (forced update)
 + 94f429b...29859e0 jepler/rtos-uspace -> origin/jepler/rtos-uspace  (forced update)
 + 7161b97...19d7fba jepler/rtos-uspace-apis -> origin/jepler/rtos-uspace-apis  (forced update)
Auto-merging tests/hm2-idrom/check-dmesg
CONFLICT (content): Merge conflict in tests/hm2-idrom/check-dmesg
Auto-merging src/rtapi/uspace_ulapi.c
CONFLICT (content): Merge conflict in src/rtapi/uspace_ulapi.c
Auto-merging src/rtapi/uspace_rtapi_app.cc
CONFLICT (add/add): Merge conflict in src/rtapi/uspace_rtapi_app.cc
Auto-merging src/rtapi/uspace_common.h
CONFLICT (content): Merge conflict in src/rtapi/uspace_common.h
Auto-merging src/rtapi/rtapi_string.h
CONFLICT (content): Merge conflict in src/rtapi/rtapi_string.h
Auto-merging src/rtapi/rtapi_pci.h
CONFLICT (add/add): Merge conflict in src/rtapi/rtapi_pci.h
Auto-merging src/rtapi/rtapi_pci.cc
CONFLICT (add/add): Merge conflict in src/rtapi/rtapi_pci.cc
Auto-merging src/rtapi/rtapi_list.h
CONFLICT (add/add): Merge conflict in src/rtapi/rtapi_list.h
Auto-merging src/rtapi/rtapi_firmware.h
CONFLICT (add/add): Merge conflict in src/rtapi/rtapi_firmware.h
Auto-merging src/rtapi/rtapi_device.h
CONFLICT (add/add): Merge conflict in src/rtapi/rtapi_device.h
Auto-merging src/rtapi/rtapi.h
Auto-merging src/hal/halmodule.cc
CONFLICT (content): Merge conflict in src/hal/halmodule.cc
Auto-merging src/hal/drivers/mesa-hostmot2/tram.c
CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/tram.c
Auto-merging src/hal/drivers/mesa-hostmot2/sserial.h
CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/sserial.h
Auto-merging src/hal/drivers/mesa-hostmot2/sserial.c
CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/sserial.c
Auto-merging src/hal/drivers/mesa-hostmot2/resolver.c
CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/resolver.c
Auto-merging src/hal/drivers/mesa-hostmot2/hm2_pci.c
CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/hm2_pci.c
Auto-merging src/hal/drivers/mesa-hostmot2/hm2_eth.c
CONFLICT (add/add): Merge conflict in src/hal/drivers/mesa-hostmot2/hm2_eth.c
Auto-merging src/hal/drivers/mesa-hostmot2/dpll.c
CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/dpll.c
Auto-merging src/hal/drivers/mesa-hostmot2/bspi.c
CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/bspi.c
Auto-merging src/hal/drivers/mesa-hostmot2/abs_encoder.c
CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/abs_encoder.c
Auto-merging src/configure.in
CONFLICT (content): Merge conflict in src/configure.in
Auto-merging debian/configure
Automatic merge failed; fix conflicts and then commit the result.