Changeset 231b3fd in mainline

Timestamp:

2018-08-25T21:35:26Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

Location:

uspace

Files:

• app/barber/barber.c (modified) (view diffs)
• app/bdsh/cmds/modules/sleep/sleep.c (modified) (view diffs)
• app/bnchmark/bnchmark.c (modified) (view diffs)
• app/modplay/modplay.c (modified) (view diffs)
• app/stats/stats.c (modified) (view diffs)
• app/tester/ipc/ping_pong.c (modified) (view diffs)
• app/tester/ipc/starve.c (modified) (view diffs)
• app/testread/testread.c (modified) (view diffs)
• app/tetris/scores.h (modified) (view diffs)
• app/tetris/screen.c (modified) (view diffs)
• app/tetris/tetris.c (modified) (view diffs)
• app/top/screen.c (modified) (view diffs)
• app/top/screen.h (modified) (view diffs)
• app/top/top.c (modified) (view diffs)
• app/wavplay/dplay.c (modified) (view diffs)
• dist/src/c/demos/tetris/scores.h (modified) (view diffs)
• dist/src/c/demos/tetris/tetris.c (modified) (view diffs)
• dist/src/c/demos/top/top.c (modified) (view diffs)
• drv/bus/usb/uhci/uhci_rh.c (modified) (view diffs)
• drv/bus/usb/usbdiag/tests.c (modified) (view diffs)
• drv/bus/usb/vhc/hub/hub.c (modified) (view diffs)
• drv/bus/usb/xhci/hc.c (modified) (view diffs)
• drv/bus/usb/xhci/isoch.c (modified) (view diffs)
• drv/nic/e1k/e1k.c (modified) (view diffs)
• drv/nic/rtl8139/driver.c (modified) (view diffs)
• drv/nic/rtl8139/general.c (modified) (view diffs)
• drv/nic/rtl8139/general.h (modified) (view diffs)
• drv/time/cmos-rtc/cmos-rtc.c (modified) (view diffs)
• lib/c/generic/async/client.c (modified) (view diffs)
• lib/c/generic/async/ports.c (modified) (view diffs)
• lib/c/generic/async/server.c (modified) (view diffs)
• lib/c/generic/io/console.c (modified) (view diffs)
• lib/c/generic/private/async.h (modified) (view diffs)
• lib/c/generic/private/fibril.h (modified) (view diffs)
• lib/c/generic/private/futex.h (modified) (view diffs)
• lib/c/generic/private/thread.h (modified) (view diffs)
• lib/c/generic/rndgen.c (modified) (view diffs)
• lib/c/generic/stdlib.c (modified) (view diffs)
• lib/c/generic/thread/fibril.c (modified) (view diffs)
• lib/c/generic/thread/fibril_synch.c (modified) (view diffs)
• lib/c/generic/thread/mpsc.c (modified) (view diffs)
• lib/c/generic/thread/thread.c (modified) (view diffs)
• lib/c/generic/time.c (modified) (view diffs)
• lib/c/include/async.h (modified) (view diffs)
• lib/c/include/ddi.h (modified) (view diffs)
• lib/c/include/fibril.h (modified) (view diffs)
• lib/c/include/fibril_synch.h (modified) (view diffs)
• lib/c/include/io/con_srv.h (modified) (view diffs)
• lib/c/include/io/console.h (modified) (view diffs)
• lib/c/include/sys/time.h (deleted)
• lib/c/include/time.h (modified) (view diffs)
• lib/cpp/include/__bits/chrono.hpp (modified) (view diffs)
• lib/cpp/include/__bits/thread/threading.hpp (modified) (view diffs)
• lib/drv/generic/remote_nic.c (modified) (view diffs)
• lib/drv/include/nic_iface.h (modified) (view diffs)
• lib/drv/include/ops/nic.h (modified) (view diffs)
• lib/drv/include/pci_dev_iface.h (modified) (view diffs)
• lib/nic/include/nic.h (modified) (view diffs)
• lib/nic/include/nic_driver.h (modified) (view diffs)
• lib/nic/include/nic_impl.h (modified) (view diffs)
• lib/nic/src/nic_driver.c (modified) (view diffs)
• lib/nic/src/nic_impl.c (modified) (view diffs)
• lib/pcm/include/pcm/format.h (modified) (view diffs)
• lib/pcm/include/pcm/sample_format.h (modified) (view diffs)
• lib/pcut/src/os/helenos.c (modified) (view diffs)
• lib/posix/include/posix/sys/time.h (modified) (view diffs)
• lib/posix/include/posix/sys/types.h (modified) (view diffs)
• lib/posix/include/posix/time.h (modified) (view diffs)
• lib/posix/src/internal/common.h (modified) (view diffs)
• lib/posix/src/time.c (modified) (view diffs)
• lib/usb/include/usb/port.h (modified) (view diffs)
• lib/usb/src/port.c (modified) (view diffs)
• lib/usbhost/include/usb/host/endpoint.h (modified) (view diffs)
• lib/usbhost/src/endpoint.c (modified) (view diffs)
• srv/audio/hound/audio_device.c (modified) (view diffs)
• srv/net/ethip/atrans.c (modified) (view diffs)
• srv/net/ethip/atrans.h (modified) (view diffs)
• srv/net/inetsrv/ntrans.c (modified) (view diffs)
• srv/net/inetsrv/ntrans.h (modified) (view diffs)
• srv/net/tcp/tcp_type.h (modified) (view diffs)