search

open-power / occ

Apache License 2.0
24 stars 39 forks source link

master rebased, breaks everything #14

Closed ghost closed 8 years ago

ghost commented 8 years ago

You rebased master, which is a big no-no with git.

This breaks everybody who had a tree for development.

ghost commented 8 years ago

i.e. please fix this merge conflict:

[stewart@birb occ]$ git pull
remote: Counting objects: 2496, done.
remote: Total 2496 (delta 917), reused 917 (delta 917), pack-reused 1579
Receiving objects: 100% (2496/2496), 1.92 MiB | 1.08 MiB/s, done.
Resolving deltas: 100% (1953/1953), completed with 180 local objects.
From github.com:open-power/occ
 + 69fb587...30ed768 master     -> origin/master  (forced update)
 * [new branch]      master_p8  -> origin/master_p8
Auto-merging src/ssx/ssx/ssxssxfiles.mk
CONFLICT (content): Merge conflict in src/ssx/ssx/ssxssxfiles.mk
Auto-merging src/ssx/ssx/ssx_timer_init.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_timer_init.c
Auto-merging src/ssx/ssx/ssx_timer_core.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_timer_core.c
Auto-merging src/ssx/ssx/ssx_thread_init.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_thread_init.c
Auto-merging src/ssx/ssx/ssx_thread_core.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_thread_core.c
Auto-merging src/ssx/ssx/ssx_stack_init.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_stack_init.c
Auto-merging src/ssx/ssx/ssx_semaphore_init.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_semaphore_init.c
Auto-merging src/ssx/ssx/ssx_semaphore_core.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_semaphore_core.c
Auto-merging src/ssx/ssx/ssx_macros.h
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_macros.h
Auto-merging src/ssx/ssx/ssx_kernel.h
Auto-merging src/ssx/ssx/ssx_init.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_init.c
Auto-merging src/ssx/ssx/ssx_core.c
CONFLICT (content): Merge conflict in src/ssx/ssx/ssx_core.c
Auto-merging src/ssx/ssx/ssx_api.h
Auto-merging src/ssx/ssx/ssx.h
Auto-merging src/ssx/ssx/Makefile
CONFLICT (content): Merge conflict in src/ssx/ssx/Makefile
Auto-merging src/ssx/ppc405/ssxppc405files.mk
CONFLICT (content): Merge conflict in src/ssx/ppc405/ssxppc405files.mk
Auto-merging src/ssx/ppc405/ssx_port_types.h
Auto-merging src/ssx/ppc405/ppc405_thread_init.S
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_thread_init.S
Auto-merging src/ssx/ppc405/ppc405_spr.h
Auto-merging src/ssx/ppc405/ppc405_msr.h
Auto-merging src/ssx/ppc405/ppc405_mmu_asm.S
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_mmu_asm.S
Auto-merging src/ssx/ppc405/ppc405_mmu.h
Auto-merging src/ssx/ppc405/ppc405_mmu.c
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_mmu.c
Auto-merging src/ssx/ppc405/ppc405_lib_core.c
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_lib_core.c
Auto-merging src/ssx/ppc405/ppc405_irq_init.c
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_irq_init.c
Auto-merging src/ssx/ppc405/ppc405_irq_core.c
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_irq_core.c
Auto-merging src/ssx/ppc405/ppc405_irq.h
Auto-merging src/ssx/ppc405/ppc405_init.c
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_init.c
Auto-merging src/ssx/ppc405/ppc405_exceptions.S
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_exceptions.S
Auto-merging src/ssx/ppc405/ppc405_dcr.h
Auto-merging src/ssx/ppc405/ppc405_core.c
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_core.c
Auto-merging src/ssx/ppc405/ppc405_context.h
Auto-merging src/ssx/ppc405/ppc405_cache_init.S
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_cache_init.S
Auto-merging src/ssx/ppc405/ppc405_cache_core.c
Auto-merging src/ssx/ppc405/ppc405_cache.h
Auto-merging src/ssx/ppc405/ppc405_breakpoint.S
CONFLICT (content): Merge conflict in src/ssx/ppc405/ppc405_breakpoint.S
Auto-merging src/ssx/ppc405/ppc405_boot.S
Auto-merging src/ssx/ppc405/ppc405.h
Auto-merging src/ssx/ppc405/Makefile
CONFLICT (content): Merge conflict in src/ssx/ppc405/Makefile
Auto-merging src/ssx/ppc32/ssxppc32files.mk
CONFLICT (content): Merge conflict in src/ssx/ppc32/ssxppc32files.mk
Auto-merging src/ssx/ppc32/savegpr.S
CONFLICT (content): Merge conflict in src/ssx/ppc32/savegpr.S
Auto-merging src/ssx/ppc32/ppc32_gcc.h
Auto-merging src/ssx/ppc32/ppc32_gcc.c
Auto-merging src/ssx/ppc32/ppc32_asm.h
CONFLICT (content): Merge conflict in src/ssx/ppc32/ppc32_asm.h
Auto-merging src/ssx/ppc32/ppc32.h
CONFLICT (modify/delete): src/ssx/ppc32/gnu/stubs-32.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/ppc32/gnu/stubs-32.h left in tree.
Auto-merging src/ssx/ppc32/div64.S
CONFLICT (content): Merge conflict in src/ssx/ppc32/div64.S
Auto-merging src/ssx/ppc32/Makefile
CONFLICT (content): Merge conflict in src/ssx/ppc32/Makefile
CONFLICT (modify/delete): src/ssx/pgp/ssxpgpfiles.mk deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/ssxpgpfiles.mk left in tree.
CONFLICT (modify/delete): src/ssx/pgp/ssx_port.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/ssx_port.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/ssx.mk deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/ssx.mk left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/tpc_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/tpc_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/tod_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/tod_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/tod_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/tod_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/sramctl_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/sramctl_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/sensors_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/sensors_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/sensors_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/sensors_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/sbe_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/sbe_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/sbe_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/sbe_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pore_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pore_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pore_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pore_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/plb_arbiter_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/plb_arbiter_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/plb_arbiter_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/plb_arbiter_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pibmem_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pibmem_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pibmem_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pibmem_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pcbs_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pcbs_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pcbs_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pcbs_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pc_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pc_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pc_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pc_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/pba_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/pba_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/oha_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/oha_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/oha_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/oha_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/ocb_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/ocb_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/ocb_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/ocb_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/mcs_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/mcs_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/mcs_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/mcs_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/icp_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/icp_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/icp_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/icp_firmware_registers.h left in tree.
Removing src/ssx/pgp/registers/i2cengine_register_addresses.h
Removing src/ssx/pgp/registers/i2cengine_firmware_registers.h
CONFLICT (modify/delete): src/ssx/pgp/registers/fasti2c_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/fasti2c_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/fasti2c_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/fasti2c_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/centaur_register_addresses.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/centaur_register_addresses.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/registers/centaur_firmware_registers.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/registers/centaur_firmware_registers.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_vrm.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_vrm.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_trace.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_trace.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_sramctl.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_sramctl.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_pore.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_pore.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_pmc.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_pmc.c left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_ocb.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_ocb.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_irq_init.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_irq_init.c left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_init.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_init.c left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_id.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_id.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_core.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_core.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_centaur.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_centaur.h left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_centaur.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_centaur.c left in tree.
CONFLICT (modify/delete): src/ssx/pgp/pgp_async_pore.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/pgp_async_pore.c left in tree.
Removing src/ssx/pgp/linkssx.cmd
CONFLICT (modify/delete): src/ssx/pgp/Makefile deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/ssx/pgp/Makefile left in tree.
Auto-merging src/ssx/occhw/ssx_port.h
Auto-merging src/ssx/occhw/occhw_scom.h
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_scom.h
Auto-merging src/ssx/occhw/occhw_pba.h
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_pba.h
Auto-merging src/ssx/occhw/occhw_pba.c
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_pba.c
Auto-merging src/ssx/occhw/occhw_ocb.c
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_ocb.c
Auto-merging src/ssx/occhw/occhw_irq.h
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_irq.h
Auto-merging src/ssx/occhw/occhw_id.c
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_id.c
Auto-merging src/ssx/occhw/occhw_cache.S
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_cache.S
Auto-merging src/ssx/occhw/occhw_async_pba.c
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_async_pba.c
Auto-merging src/ssx/occhw/occhw_async_ocb.c
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_async_ocb.c
Auto-merging src/ssx/occhw/occhw_async.h
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_async.h
Auto-merging src/ssx/occhw/occhw_async.c
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw_async.c
Auto-merging src/ssx/occhw/occhw.h
CONFLICT (content): Merge conflict in src/ssx/occhw/occhw.h
Auto-merging src/ppe/tools/ppetracepp/Makefile
Auto-merging src/ppe/pk/ppe/pkppefiles.mk
Auto-merging src/occ_gpe1/topfiles.mk
Auto-merging src/occ_gpe0/pss_constants.h
Auto-merging src/occ_gpe0/apss_constants.h
Auto-merging src/occ_405/trac/trac_service_codes.h
Auto-merging src/occ_405/trac/trac_interface.h
Auto-merging src/occ_405/trac/trac_interface.c
Auto-merging src/occ_405/trac/trac.h
Auto-merging src/occ_405/topfiles.mk
CONFLICT (content): Merge conflict in src/occ_405/topfiles.mk
Auto-merging src/occ_405/timer/timer_service_codes.h
Auto-merging src/occ_405/timer/timer.h
Auto-merging src/occ_405/timer/timer.c
Auto-merging src/occ_405/thread/thread_service_codes.h
Auto-merging src/occ_405/thread/threadSch.h
Auto-merging src/occ_405/thread/threadSch.c
CONFLICT (content): Merge conflict in src/occ_405/thread/threadSch.c
Auto-merging src/occ_405/thread/thread.h
Auto-merging src/occ_405/thread/test/threadtest.c
Auto-merging src/occ_405/thread/test/app.mk
Auto-merging src/occ_405/thread/test/Makefile
Auto-merging src/occ_405/thread/chom.c
Auto-merging src/occ_405/state.h
Auto-merging src/occ_405/state.c
CONFLICT (content): Merge conflict in src/occ_405/state.c
Auto-merging src/occ_405/sensor/sensor_table.c
CONFLICT (content): Merge conflict in src/occ_405/sensor/sensor_table.c
Auto-merging src/occ_405/sensor/sensor_service_codes.h
Auto-merging src/occ_405/sensor/sensor_query_list.h
Auto-merging src/occ_405/sensor/sensor_query_list.c
Auto-merging src/occ_405/sensor/sensor_info.c
Auto-merging src/occ_405/sensor/sensor_enum.h
CONFLICT (content): Merge conflict in src/occ_405/sensor/sensor_enum.h
Auto-merging src/occ_405/sensor/sensor.h
Auto-merging src/occ_405/sensor/sensor.c
Auto-merging src/occ_405/scom.h
Auto-merging src/occ_405/scom.c
Auto-merging src/occ_405/rtls/test/rtls_tables.c
Auto-merging src/occ_405/rtls/test/main.c
Auto-merging src/occ_405/rtls/test/app.mk
Auto-merging src/occ_405/rtls/test/Makefile
Auto-merging src/occ_405/rtls/rtls_tables.c
Auto-merging src/occ_405/rtls/rtls_service_codes.h
Auto-merging src/occ_405/rtls/rtls.h
Auto-merging src/occ_405/rtls/rtls.c
Auto-merging src/occ_405/reset.c
CONFLICT (content): Merge conflict in src/occ_405/reset.c
Auto-merging src/occ_405/pss/test/apsstest.c
Auto-merging src/occ_405/pss/test/app.mk
Auto-merging src/occ_405/pss/test/Makefile
Auto-merging src/occ_405/pss/pss_service_codes.h
Auto-merging src/occ_405/pss/dpss_init.c
Auto-merging src/occ_405/pss/dpss.h
Auto-merging src/occ_405/pss/dpss.c
Auto-merging src/occ_405/pss/apss.h
Auto-merging src/occ_405/pss/apss.c
Auto-merging src/occ_405/proc/test/main.c
Auto-merging src/occ_405/proc/test/app.mk
Auto-merging src/occ_405/proc/test/Makefile
Auto-merging src/occ_405/proc/proc_pstate.h
CONFLICT (content): Merge conflict in src/occ_405/proc/proc_pstate.h
Auto-merging src/occ_405/proc/proc_data_service_codes.h
Auto-merging src/occ_405/proc/proc_data_control.h
Auto-merging src/occ_405/proc/proc_data_control.c
Auto-merging src/occ_405/proc/proc_data.h
Auto-merging src/occ_405/occ_sys_config.h
CONFLICT (content): Merge conflict in src/occ_405/occ_sys_config.h
Auto-merging src/occ_405/occ_sys_config.c
Auto-merging src/occ_405/occ_service_codes.h
Auto-merging src/occ_405/occ_defs.mk
Auto-merging src/occ_405/occLinkInputFile
CONFLICT (content): Merge conflict in src/occ_405/occLinkInputFile
Auto-merging src/occ_405/mode.h
Auto-merging src/occ_405/mode.c
Auto-merging src/occ_405/main.c
CONFLICT (content): Merge conflict in src/occ_405/main.c
Auto-merging src/occ_405/linkocc.cmd
Auto-merging src/occ_405/incl/occ_common.h
Auto-merging src/occ_405/incl/comp_ids.h
Auto-merging src/occ_405/incl/common_types.h
CONFLICT (content): Merge conflict in src/occ_405/incl/common_types.h
Auto-merging src/occ_405/homer.h
Auto-merging src/occ_405/homer.c
Auto-merging src/occ_405/firdata/fir_data_collect.c
Auto-merging src/occ_405/errl/test/test.mk
Auto-merging src/occ_405/errl/test/parser.c
Auto-merging src/occ_405/errl/test/gpefiles.mk
Auto-merging src/occ_405/errl/test/errltest.c
Auto-merging src/occ_405/errl/test/app.mk
Auto-merging src/occ_405/errl/test/Makefile
Auto-merging src/occ_405/errl/errl.h
Auto-merging src/occ_405/errl/errl.c
Auto-merging src/occ_405/dcom/dcom_thread.c
Auto-merging src/occ_405/dcom/dcom_service_codes.h
Auto-merging src/occ_405/dcom/dcomSlaveTx.c
Auto-merging src/occ_405/dcom/dcomSlaveRx.c
CONFLICT (content): Merge conflict in src/occ_405/dcom/dcomSlaveRx.c
Auto-merging src/occ_405/dcom/dcomMasterTx.c
Auto-merging src/occ_405/dcom/dcomMasterRx.c
Auto-merging src/occ_405/dcom/dcom.h
CONFLICT (content): Merge conflict in src/occ_405/dcom/dcom.h
Auto-merging src/occ_405/dcom/dcom.c
CONFLICT (content): Merge conflict in src/occ_405/dcom/dcom.c
Auto-merging src/occ_405/cmdh/ll_ffdc.S
Auto-merging src/occ_405/cmdh/ffdc.h
Auto-merging src/occ_405/cmdh/ffdc.c
Auto-merging src/occ_405/cmdh/cmdh_tunable_parms.h
Auto-merging src/occ_405/cmdh/cmdh_tunable_parms.c
Auto-merging src/occ_405/cmdh/cmdh_thread.c
Auto-merging src/occ_405/cmdh/cmdh_snapshot.h
Auto-merging src/occ_405/cmdh/cmdh_snapshot.c
CONFLICT (content): Merge conflict in src/occ_405/cmdh/cmdh_snapshot.c
Auto-merging src/occ_405/cmdh/cmdh_service_codes.h
Auto-merging src/occ_405/cmdh/cmdh_mnfg_intf.h
Auto-merging src/occ_405/cmdh/cmdh_mnfg_intf.c
CONFLICT (content): Merge conflict in src/occ_405/cmdh/cmdh_mnfg_intf.c
Auto-merging src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.h
CONFLICT (content): Merge conflict in src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.h
Auto-merging src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c
CONFLICT (content): Merge conflict in src/occ_405/cmdh/cmdh_fsp_cmds_datacnfg.c
Auto-merging src/occ_405/cmdh/cmdh_fsp_cmds.h
Auto-merging src/occ_405/cmdh/cmdh_fsp_cmds.c
CONFLICT (content): Merge conflict in src/occ_405/cmdh/cmdh_fsp_cmds.c
Auto-merging src/occ_405/cmdh/cmdh_fsp.h
Auto-merging src/occ_405/cmdh/cmdh_fsp.c
CONFLICT (content): Merge conflict in src/occ_405/cmdh/cmdh_fsp.c
Auto-merging src/occ_405/cmdh/cmdh_dbug_cmd.h
Auto-merging src/occ_405/cmdh/cmdh_dbug_cmd.c
Auto-merging src/occ_405/cent/centaur_data_service_codes.h
Auto-merging src/occ_405/cent/centaur_data.h
Auto-merging src/occ_405/cent/centaur_data.c
Auto-merging src/occ_405/cent/centaur_control.h
Auto-merging src/occ_405/cent/centaur_control.c
Auto-merging src/occ_405/arl_test_data.h
Auto-merging src/occ_405/arl_test.c
Auto-merging src/occ_405/amec/amec_tasks.c
Auto-merging src/occ_405/amec/amec_sys.h
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_sys.h
Auto-merging src/occ_405/amec/amec_smh.h
Auto-merging src/occ_405/amec/amec_slave_smh.h
Auto-merging src/occ_405/amec/amec_service_codes.h
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_service_codes.h
Auto-merging src/occ_405/amec/amec_sensors_power.c
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_sensors_power.c
Auto-merging src/occ_405/amec/amec_sensors_fw.h
Auto-merging src/occ_405/amec/amec_sensors_fw.c
Auto-merging src/occ_405/amec/amec_sensors_core.h
Auto-merging src/occ_405/amec/amec_sensors_core.c
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_sensors_core.c
Auto-merging src/occ_405/amec/amec_sensors_centaur.h
Auto-merging src/occ_405/amec/amec_sensors_centaur.c
Auto-merging src/occ_405/amec/amec_perfcount.h
Auto-merging src/occ_405/amec/amec_perfcount.c
Auto-merging src/occ_405/amec/amec_pcap.h
Auto-merging src/occ_405/amec/amec_pcap.c
Auto-merging src/occ_405/amec/amec_part.h
Auto-merging src/occ_405/amec/amec_part.c
Auto-merging src/occ_405/amec/amec_parm_table.c
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_parm_table.c
Auto-merging src/occ_405/amec/amec_parm.h
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_parm.h
Auto-merging src/occ_405/amec/amec_parm.c
Auto-merging src/occ_405/amec/amec_oversub.h
Auto-merging src/occ_405/amec/amec_oversub.c
Auto-merging src/occ_405/amec/amec_master_smh.h
Auto-merging src/occ_405/amec/amec_master_smh.c
Auto-merging src/occ_405/amec/amec_init.c
Auto-merging src/occ_405/amec/amec_health.h
Auto-merging src/occ_405/amec/amec_health.c
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_health.c
Auto-merging src/occ_405/amec/amec_freq.h
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_freq.h
Auto-merging src/occ_405/amec/amec_freq.c
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_freq.c
Auto-merging src/occ_405/amec/amec_external.h
Auto-merging src/occ_405/amec/amec_dps.h
Auto-merging src/occ_405/amec/amec_dps.c
Auto-merging src/occ_405/amec/amec_data.h
Auto-merging src/occ_405/amec/amec_data.c
Auto-merging src/occ_405/amec/amec_controller.h
Auto-merging src/occ_405/amec/amec_controller.c
Auto-merging src/occ_405/amec/amec_analytics.h
Auto-merging src/occ_405/amec/amec_analytics.c
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_analytics.c
Auto-merging src/occ_405/amec/amec_amester.h
CONFLICT (content): Merge conflict in src/occ_405/amec/amec_amester.h
Auto-merging src/occ_405/amec/amec_amester.c
Auto-merging src/occBootLoader/bootMain.h
CONFLICT (content): Merge conflict in src/occBootLoader/bootMain.h
Auto-merging src/occBootLoader/bootMain.c
CONFLICT (content): Merge conflict in src/occBootLoader/bootMain.c
Removing src/occApplet/testApplet/traceTest.c
Removing src/occApplet/testApplet/testApltId.h
CONFLICT (modify/delete): src/occApplet/testApplet/sensorTest.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/occApplet/testApplet/sensorTest.c left in tree.
Removing src/occApplet/testApplet/pstApplet.c
Removing src/occApplet/testApplet/linkTestApplet.cmd
Removing src/occApplet/testApplet/errlTest.c
Removing src/occApplet/testApplet/apsstest.c
Removing src/occApplet/testApplet/Makefile
Removing src/occApplet/template.c
Removing src/occApplet/productApplet/productappletfiles.mk
Removing src/occApplet/productApplet/occLinkInputFile
Removing src/occApplet/productApplet/linkProductApplet.cmd
Removing src/occApplet/productApplet/apssInitApplet.c
Removing src/occApplet/productApplet/Makefile
Removing src/occApplet/Makefile
Removing src/occ/thread/thrm_thread.h
Removing src/occ/thread/thrm_thread.c
Removing src/occ/ssx_app_cfg.h
CONFLICT (modify/delete): src/occ/proc/proc_pstate.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/occ/proc/proc_pstate.c left in tree.
Removing src/occ/proc/proc_data.c
Removing src/occ/gpe/pss_macros.h
Removing src/occ/gpe/pore_test_pss.pS
Removing src/occ/gpe/pore_test_error.pS
Removing src/occ/gpe/pore_test.pS
Removing src/occ/gpe/gpe_macros.h
Removing src/occ/gpe/apss_meas_read_start.pS
Removing src/occ/gpe/apss_meas_read_cont.pS
Removing src/occ/gpe/apss_meas_read_complete.pS
Removing src/occ/gpe/apss_init.pS
Removing src/occ/gpe/apss_composite.pS
Removing src/occ/gpe/apss_altitude.pS
Removing src/occ/common.c
Removing src/occ/app.mk
Removing src/occ/aplt/incl/appletId.h
Removing src/occ/aplt/appletManager.h
Removing src/occ/aplt/appletManager.c
Removing src/occ/aplt/aplt_service_codes.h
CONFLICT (modify/delete): src/occ/amec/amec_slave_smh.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/occ/amec/amec_slave_smh.c left in tree.
Removing src/occ/Makefile
CONFLICT (modify/delete): src/lib/vrm.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/vrm.h left in tree.
CONFLICT (modify/delete): src/lib/vrm.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/vrm.c left in tree.
CONFLICT (modify/delete): src/lib/time.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/time.c left in tree.
CONFLICT (modify/delete): src/lib/string.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/string.h left in tree.
CONFLICT (modify/delete): src/lib/strdup.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/strdup.c left in tree.
CONFLICT (modify/delete): src/lib/strcasecmp.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/strcasecmp.c left in tree.
CONFLICT (modify/delete): src/lib/ssx_dump.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/ssx_dump.h left in tree.
CONFLICT (modify/delete): src/lib/special_wakeup.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/special_wakeup.h left in tree.
CONFLICT (modify/delete): src/lib/special_wakeup.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/special_wakeup.c left in tree.
CONFLICT (modify/delete): src/lib/simics_stdio.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/simics_stdio.h left in tree.
CONFLICT (modify/delete): src/lib/pstates.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/pstates.h left in tree.
CONFLICT (modify/delete): src/lib/pstates.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/pstates.c left in tree.
Auto-merging src/lib/ppc405lib/strtox.h
CONFLICT (content): Merge conflict in src/lib/ppc405lib/strtox.h
Auto-merging src/lib/ppc405lib/strtox.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/strtox.c
Auto-merging src/lib/ppc405lib/string_stream.h
CONFLICT (content): Merge conflict in src/lib/ppc405lib/string_stream.h
Auto-merging src/lib/ppc405lib/string_stream.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/string_stream.c
Auto-merging src/lib/ppc405lib/stdlib.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/stdlib.c
Auto-merging src/lib/ppc405lib/ssx_io.h
CONFLICT (content): Merge conflict in src/lib/ppc405lib/ssx_io.h
Auto-merging src/lib/ppc405lib/ssx_io.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/ssx_io.c
Auto-merging src/lib/ppc405lib/ssx_dump.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/ssx_dump.c
Auto-merging src/lib/ppc405lib/sprintf.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/sprintf.c
Auto-merging src/lib/ppc405lib/simics_stdio_addresses.h
CONFLICT (content): Merge conflict in src/lib/ppc405lib/simics_stdio_addresses.h
Auto-merging src/lib/ppc405lib/simics_stdio.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/simics_stdio.c
Auto-merging src/lib/ppc405lib/puts.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/puts.c
Auto-merging src/lib/ppc405lib/printf.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/printf.c
Auto-merging src/lib/ppc405lib/polling.h
CONFLICT (content): Merge conflict in src/lib/ppc405lib/polling.h
Auto-merging src/lib/ppc405lib/libssx.h
Auto-merging src/lib/ppc405lib/fgetc.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/fgetc.c
Auto-merging src/lib/ppc405lib/ctype_table.c
CONFLICT (content): Merge conflict in src/lib/ppc405lib/ctype_table.c
Auto-merging src/lib/ppc405lib/ctype.h
CONFLICT (content): Merge conflict in src/lib/ppc405lib/ctype.h
CONFLICT (modify/delete): src/lib/pore_hooks.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/pore_hooks.h left in tree.
CONFLICT (modify/delete): src/lib/polling.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/polling.c left in tree.
CONFLICT (modify/delete): src/lib/pmc_dcm.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/pmc_dcm.h left in tree.
CONFLICT (modify/delete): src/lib/pmc_dcm.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/pmc_dcm.c left in tree.
CONFLICT (modify/delete): src/lib/pgp_config.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/pgp_config.h left in tree.
CONFLICT (modify/delete): src/lib/pgas_ppc.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/pgas_ppc.h left in tree.
CONFLICT (modify/delete): src/lib/pgas.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/pgas.h left in tree.
CONFLICT (modify/delete): src/lib/memcpy.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/memcpy.c left in tree.
CONFLICT (modify/delete): src/lib/libssx.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/libssx.h left in tree.
CONFLICT (modify/delete): src/lib/libgpefiles.mk deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/libgpefiles.mk left in tree.
CONFLICT (modify/delete): src/lib/libfiles.mk deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/libfiles.mk left in tree.
CONFLICT (modify/delete): src/lib/heartbeat.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/heartbeat.h left in tree.
CONFLICT (modify/delete): src/lib/heartbeat.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/heartbeat.c left in tree.
CONFLICT (modify/delete): src/lib/gpsm_init.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpsm_init.c left in tree.
Removing src/lib/gpsm_dcm_fast_handler.S
CONFLICT (modify/delete): src/lib/gpsm_dcm.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpsm_dcm.h left in tree.
CONFLICT (modify/delete): src/lib/gpsm_dcm.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpsm_dcm.c left in tree.
CONFLICT (modify/delete): src/lib/gpsm.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpsm.h left in tree.
CONFLICT (modify/delete): src/lib/gpsm.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpsm.c left in tree.
CONFLICT (modify/delete): src/lib/gpe_scom.pS deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_scom.pS left in tree.
CONFLICT (modify/delete): src/lib/gpe_scom.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_scom.h left in tree.
CONFLICT (modify/delete): src/lib/gpe_pba_pgas.pS deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_pba_pgas.pS left in tree.
CONFLICT (modify/delete): src/lib/gpe_pba.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_pba.h left in tree.
CONFLICT (modify/delete): src/lib/gpe_pba.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_pba.c left in tree.
CONFLICT (modify/delete): src/lib/gpe_data.pS deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_data.pS left in tree.
CONFLICT (modify/delete): src/lib/gpe_data.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_data.h left in tree.
CONFLICT (modify/delete): src/lib/gpe_control.pS deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_control.pS left in tree.
CONFLICT (modify/delete): src/lib/gpe_control.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe_control.h left in tree.
CONFLICT (modify/delete): src/lib/gpe.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/gpe.h left in tree.
CONFLICT (modify/delete): src/lib/errno.h deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/errno.h left in tree.
CONFLICT (modify/delete): src/lib/ctype.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/ctype.c left in tree.
Auto-merging src/lib/common/string.c
CONFLICT (content): Merge conflict in src/lib/common/string.c
Auto-merging src/lib/common/memset.c
CONFLICT (content): Merge conflict in src/lib/common/memset.c
Auto-merging src/lib/common/libcommonfiles.mk
CONFLICT (modify/delete): src/lib/assert.c deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/assert.c left in tree.
CONFLICT (modify/delete): src/lib/Makefile deleted in 30ed7685e39b12255247d0c30db8660f4e42eadb and modified in HEAD. Version HEAD of src/lib/Makefile left in tree.
Auto-merging src/include/registers/tpc_firmware_registers.h
CONFLICT (content): Merge conflict in src/include/registers/tpc_firmware_registers.h
Auto-merging src/include/registers/sramctl_firmware_registers.h
CONFLICT (content): Merge conflict in src/include/registers/sramctl_firmware_registers.h
Auto-merging src/include/registers/pmc_register_addresses.h
CONFLICT (content): Merge conflict in src/include/registers/pmc_register_addresses.h
Auto-merging src/include/registers/pmc_firmware_registers.h
CONFLICT (content): Merge conflict in src/include/registers/pmc_firmware_registers.h
Auto-merging src/include/registers/pba_firmware_registers.h
CONFLICT (content): Merge conflict in src/include/registers/pba_firmware_registers.h
Auto-merging src/include/occhw_common.h
CONFLICT (content): Merge conflict in src/include/occhw_common.h
Auto-merging src/Makefile
CONFLICT (content): Merge conflict in src/Makefile
Automatic merge failed; fix conflicts and then commit the result.
williamspatrick commented 8 years ago

This is not going to be fixed. The occ repository was not following the conventions we put in place for the other repositories that had a P8 / P9 split. This has been fixed by a branch rename. What you previously saw as 'master' is now 'master-p8'. You should be able to fix up you .git/config to point your local development branch at the 'master-p8' as the pull source if that is what you intend to do.