Changeset 241f1985 in mainline

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

Files:

• abi/include/abi/ipc/interfaces.h (modified) (view diffs)
• boot/Makefile (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• uspace/app/sbi/src/os/helenos.c (modified) (view diffs)
• uspace/app/sysctl/Makefile (modified) (view diffs)
• uspace/app/sysctl/main.c (modified) (view diffs)
• uspace/app/tester/proc/dummy_task.c (modified) (view diffs)
• uspace/lib/c/generic/async/client.c (modified) (view diffs)
• uspace/lib/c/generic/async/server.c (modified) (view diffs)
• uspace/lib/c/generic/ns.c (modified) (view diffs)
• uspace/lib/c/generic/private/async.h (modified) (view diffs)
• uspace/lib/c/generic/private/taskman.h (modified) (view diffs)
• uspace/lib/c/generic/task.c (modified) (view diffs)
• uspace/lib/c/generic/task_event.c (modified) (view diffs)
• uspace/lib/c/generic/taskman.c (modified) (view diffs)
• uspace/lib/c/generic/taskman_noasync.c (modified) (view diffs)
• uspace/lib/c/include/adt/dyn_array.h (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/c/include/task.h (modified) (view diffs)
• uspace/lib/c/include/taskman.h (modified) (view diffs)
• uspace/lib/conf/src/configuration.c (modified) (view diffs)
• uspace/lib/conf/src/ini.c (modified) (view diffs)
• uspace/lib/sysman/include/sysman/ctl.h (modified) (view diffs)
• uspace/lib/sysman/src/ctl.c (modified) (view diffs)
• uspace/lib/sysman/src/sysman.c (modified) (view diffs)
• uspace/srv/devman/Makefile (modified) (view diffs)
• uspace/srv/devman/driver.c (modified) (view diffs)
• uspace/srv/devman/drv_conn.c (modified) (view diffs)
• uspace/srv/hid/compositor/compositor.c (modified) (view diffs)
• uspace/srv/loader/main.c (modified) (view diffs)
• uspace/srv/locsrv/Makefile (modified) (view diffs)
• uspace/srv/locsrv/locsrv.c (modified) (view diffs)
• uspace/srv/ns/ns.c (modified) (view diffs)
• uspace/srv/sysman/Makefile (modified) (view diffs)
• uspace/srv/sysman/connection_broker.c (modified) (view diffs)
• uspace/srv/sysman/connection_broker.h (modified) (view diffs)
• uspace/srv/sysman/connection_ctl.c (modified) (view diffs)
• uspace/srv/sysman/connection_ctl.h (modified) (view diffs)
• uspace/srv/sysman/edge.c (modified) (view diffs)
• uspace/srv/sysman/job.c (modified) (view diffs)
• uspace/srv/sysman/job.h (modified) (view diffs)
• uspace/srv/sysman/job_closure.c (modified) (view diffs)
• uspace/srv/sysman/log.h (modified) (view diffs)
• uspace/srv/sysman/main.c (modified) (view diffs)
• uspace/srv/sysman/repo.c (modified) (view diffs)
• uspace/srv/sysman/sm_task.c (modified) (view diffs)
• uspace/srv/sysman/sm_task.h (modified) (view diffs)
• uspace/srv/sysman/sysman.c (modified) (view diffs)
• uspace/srv/sysman/sysman.h (modified) (view diffs)
• uspace/srv/sysman/test/job_closure.c (modified) (view diffs)
• uspace/srv/sysman/units/unit_cfg.c (modified) (view diffs)
• uspace/srv/sysman/units/unit_mnt.c (modified) (view diffs)
• uspace/srv/sysman/units/unit_svc.c (modified) (view diffs)
• uspace/srv/taskman/event.c (modified) (view diffs)
• uspace/srv/taskman/event.h (modified) (view diffs)
• uspace/srv/taskman/main.c (modified) (view diffs)
• uspace/srv/taskman/task.c (modified) (view diffs)
• uspace/srv/vfs/Makefile (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)