Changeset ebb1489 in mainline for uspace/srv

Timestamp:

2024-10-13T08:23:40Z (17 months ago)

Author:

GitHub <noreply@…>

Parents:

2a0c827c (diff), b3b79981 (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:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

Location:

uspace/srv

Files:

• bd/vbd/disk.c (modified) (view diffs)
• fs/cdfs/cdfs_ops.c (modified) (view diffs)
• fs/exfat/exfat_ops.c (modified) (view diffs)
• fs/fat/fat_ops.c (modified) (view diffs)
• fs/mfs/mfs_ops.c (modified) (view diffs)
• fs/udf/udf.h (modified) (view diffs)
• fs/udf/udf_ops.c (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• hid/console/console.h (modified) (view diffs)
• hid/display/cfgops.c (modified) (view diffs)
• hid/display/display.c (modified) (view diffs)
• hid/display/display.h (modified) (view diffs)
• hid/display/idevcfg.c (modified) (view diffs)
• hid/display/idevcfg.h (modified) (view diffs)
• hid/display/main.c (modified) (view diffs)
• hid/display/main.h (modified) (view diffs)
• hid/display/meson.build (modified) (view diffs)
• hid/display/seat.c (modified) (view diffs)
• hid/display/seat.h (modified) (view diffs)
• hid/output/ctl/serial.c (modified) (view diffs)
• hid/output/ctl/serial.h (modified) (view diffs)
• hid/output/meson.build (modified) (view diffs)
• hid/output/output.c (modified) (view diffs)
• hid/output/output.h (modified) (view diffs)
• hid/output/port/chardev.c (modified) (view diffs)
• hid/output/port/ddev.c (modified) (view diffs)
• hid/output/port/ega.c (modified) (view diffs)
• hid/output/proto/vt100.c (deleted)
• hid/remcons/meson.build (modified) (view diffs)
• hid/remcons/remcons.c (modified) (view diffs)
• hid/remcons/remcons.h (modified) (view diffs)
• hid/remcons/telnet.h (modified) (view diffs)
• hid/remcons/user.c (modified) (view diffs)
• hid/remcons/user.h (modified) (view diffs)
• meson.build (modified) (view diffs)
• net/dhcp/dhcp.c (modified) (view diffs)
• net/dhcp/main.c (modified) (view diffs)
• net/doc/doxygroups.h (modified) (view diffs)
• net/ethip/ethip_nic.c (modified) (view diffs)
• net/inetsrv/addrobj.c (modified) (view diffs)
• net/inetsrv/addrobj.h (modified) (view diffs)
• net/inetsrv/inet_link.c (modified) (view diffs)
• net/inetsrv/inet_link.h (modified) (view diffs)
• net/inetsrv/inetcfg.c (modified) (view diffs)
• net/inetsrv/inetcfg.h (modified) (view diffs)
• net/inetsrv/inetsrv.c (modified) (view diffs)
• net/inetsrv/inetsrv.h (modified) (view diffs)
• net/inetsrv/meson.build (modified) (view diffs)
• net/inetsrv/sroute.c (modified) (view diffs)
• net/inetsrv/sroute.h (modified) (view diffs)
• net/nconfsrv/iplink.c (deleted)
• net/nconfsrv/nconfsrv.c (deleted)
• taskmon/meson.build (modified) (view diffs)
• taskmon/taskmon.c (modified) (view diffs)
• volsrv/empty.c (modified) (view diffs)
• volsrv/part.c (modified) (view diffs)
• volsrv/types/volume.h (modified) (view diffs)
• volsrv/volsrv.c (modified) (view diffs)
• volsrv/volsrv.h (moved) (moved from uspace/srv/net/nconfsrv/nconfsrv.h ) (view diffs)
• volsrv/volume.c (modified) (view diffs)
• volsrv/volume.h (modified) (view diffs)