Changeset bc73be3 in mainline for kernel/generic

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

Location:

kernel/generic

Files:

• include/adt/hash_table.h (modified) (view diffs)
• include/adt/list.h (modified) (view diffs)
• include/adt/odict.h (modified) (view diffs)
• include/bitops.h (modified) (view diffs)
• include/context.h (modified) (view diffs)
• include/ddi/ddi.h (modified) (view diffs)
• include/lib/elf_load.h (modified) (view diffs)
• include/lib/refcount.h (modified) (view diffs)
• include/macros.h (modified) (view diffs)
• include/mm/as.h (modified) (view diffs)
• include/proc/program.h (modified) (view diffs)
• include/str.h (modified) (view diffs)
• include/synch/spinlock.h (modified) (view diffs)
• include/trace.h (modified) (view diffs)
• include/types/adt/odict.h (modified) (view diffs)
• src/adt/hash_table.c (modified) (view diffs)
• src/cap/cap.c (modified) (view diffs)
• src/console/kconsole.c (modified) (view diffs)
• src/ddi/ddi.c (modified) (view diffs)
• src/ddi/irq.c (modified) (view diffs)
• src/interrupt/interrupt.c (modified) (view diffs)
• src/ipc/event.c (modified) (view diffs)
• src/ipc/ipc.c (modified) (view diffs)
• src/ipc/irq.c (modified) (view diffs)
• src/ipc/kbox.c (modified) (view diffs)
• src/ipc/ops/conctmeto.c (modified) (view diffs)
• src/ipc/ops/concttome.c (modified) (view diffs)
• src/ipc/ops/dataread.c (modified) (view diffs)
• src/ipc/ops/datawrite.c (modified) (view diffs)
• src/ipc/ops/debug.c (modified) (view diffs)
• src/ipc/ops/pagein.c (modified) (view diffs)
• src/ipc/ops/sharein.c (modified) (view diffs)
• src/ipc/ops/shareout.c (modified) (view diffs)
• src/ipc/ops/stchngath.c (modified) (view diffs)
• src/ipc/sysipc.c (modified) (view diffs)
• src/lib/elf.c (modified) (view diffs)
• src/lib/ra.c (modified) (view diffs)
• src/lib/str.c (modified) (view diffs)
• src/lib/strtol.c (added)
• src/main/kinit.c (modified) (view diffs)
• src/main/main.c (modified) (view diffs)
• src/mm/as.c (modified) (view diffs)
• src/mm/backend_user.c (modified) (view diffs)
• src/mm/frame.c (modified) (view diffs)
• src/mm/page.c (modified) (view diffs)
• src/mm/slab.c (modified) (view diffs)
• src/proc/current.c (modified) (view diffs)
• src/proc/program.c (modified) (view diffs)
• src/sysinfo/sysinfo.c (modified) (view diffs)
• src/udebug/udebug.c (modified) (view diffs)
• src/udebug/udebug_ipc.c (modified) (view diffs)
• src/udebug/udebug_ops.c (modified) (view diffs)