Changeset 97c7682 in mainline for uspace/lib

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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:

Merge mainline changes.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

Location:

uspace/lib

Files:

• c/Makefile (modified) (view diffs)
• c/arch/ia64/include/fibril.h (modified) (view diffs)
• c/arch/ia64/include/thread.h (modified) (view diffs)
• c/generic/adt/measured_strings.c (deleted)
• c/generic/as.c (modified) (view diffs)
• c/generic/async.c (modified) (view diffs)
• c/generic/device/nic.c (modified) (view diffs)
• c/generic/devman.c (modified) (view diffs)
• c/generic/elf/elf_load.c (modified) (view diffs)
• c/generic/fibril.c (modified) (view diffs)
• c/generic/fibril_synch.c (modified) (view diffs)
• c/generic/inet.c (added)
• c/generic/inetcfg.c (added)
• c/generic/inetping.c (added)
• c/generic/io/printf_core.c (modified) (view diffs)
• c/generic/ipc.c (modified) (view diffs)
• c/generic/iplink.c (added)
• c/generic/iplink_srv.c (added)
• c/generic/loader.c (modified) (view diffs)
• c/generic/loc.c (modified) (view diffs)
• c/generic/malloc.c (modified) (view diffs)
• c/generic/mman.c (modified) (view diffs)
• c/generic/net/icmp_api.c (deleted)
• c/generic/net/modules.c (deleted)
• c/generic/net/packet.c (deleted)
• c/generic/net/socket_client.c (modified) (view diffs)
• c/generic/ns.c (modified) (view diffs)
• c/generic/private/async.h (modified) (view diffs)
• c/generic/stacktrace.c (modified) (view diffs)
• c/generic/stats.c (modified) (view diffs)
• c/generic/sysinfo.c (modified) (view diffs)
• c/generic/thread.c (modified) (view diffs)
• c/generic/time.c (modified) (view diffs)
• c/include/as.h (modified) (view diffs)
• c/include/async.h (modified) (view diffs)
• c/include/devman.h (modified) (view diffs)
• c/include/errno.h (modified) (view diffs)
• c/include/fibril.h (modified) (view diffs)
• c/include/inet/inet.h (moved) (moved from uspace/lib/net/include/net_hardware.h ) (view diffs)
• c/include/inet/inetcfg.h (added)
• c/include/inet/inetping.h (moved) (moved from uspace/lib/c/generic/net/icmp_common.c ) (view diffs)
• c/include/inet/iplink.h (moved) (moved from uspace/lib/net/include/il_remote.h ) (view diffs)
• c/include/inet/iplink_srv.h (moved) (moved from uspace/lib/c/include/adt/measured_strings.h ) (view diffs)
• c/include/ipc/devman.h (modified) (view diffs)
• c/include/ipc/icmp.h (deleted)
• c/include/ipc/il.h (deleted)
• c/include/ipc/inet.h (moved) (moved from uspace/srv/net/net/packet_server.h ) (view diffs)
• c/include/ipc/ip.h (deleted)
• c/include/ipc/ipc.h (modified) (view diffs)
• c/include/ipc/iplink.h (moved) (moved from uspace/lib/c/include/ipc/tl.h ) (view diffs)
• c/include/ipc/loc.h (modified) (view diffs)
• c/include/ipc/net.h (deleted)
• c/include/ipc/net_net.h (deleted)
• c/include/ipc/netif.h (deleted)
• c/include/ipc/nil.h (deleted)
• c/include/ipc/packet.h (deleted)
• c/include/ipc/services.h (modified) (view diffs)
• c/include/ipc/socket.h (modified) (view diffs)
• c/include/loc.h (modified) (view diffs)
• c/include/net/icmp_codes.h (deleted)
• c/include/net/in.h (modified) (view diffs)
• c/include/net/packet.h (deleted)
• c/include/net/packet_header.h (deleted)
• c/include/ns.h (modified) (view diffs)
• c/include/stdarg.h (modified) (view diffs)
• c/include/stdio.h (modified) (view diffs)
• c/include/sys/mman.h (modified) (view diffs)
• c/include/unistd.h (modified) (view diffs)
• clui/tinput.h (modified) (view diffs)
• drv/generic/driver.c (modified) (view diffs)
• drv/generic/interrupt.c (modified) (view diffs)
• drv/generic/log.c (modified) (view diffs)
• drv/generic/logbuf.c (modified) (view diffs)
• drv/generic/remote_usbhc.c (modified) (view diffs)
• drv/include/ddf/driver.h (modified) (view diffs)
• drv/include/ddf/interrupt.h (modified) (view diffs)
• drv/include/ops/hw_res.h (modified) (view diffs)
• drv/include/ops/nic.h (modified) (view diffs)
• fb/imgmap.c (modified) (view diffs)
• fb/screenbuffer.c (modified) (view diffs)
• fs/libfs.c (modified) (view diffs)
• net/Makefile (modified) (view diffs)
• net/adt/module_map.c (deleted)
• net/generic/generic.c (deleted)
• net/generic/net_checksum.c (deleted)
• net/generic/net_remote.c (deleted)
• net/generic/packet_client.c (deleted)
• net/generic/packet_remote.c (deleted)
• net/generic/protocol_map.c (deleted)
• net/il/arp_remote.c (deleted)
• net/il/il_remote.c (deleted)
• net/il/il_skel.c (deleted)
• net/il/ip_client.c (deleted)
• net/il/ip_remote.c (deleted)
• net/include/adt/module_map.h (deleted)
• net/include/arp_interface.h (deleted)
• net/include/generic.h (deleted)
• net/include/icmp_header.h (deleted)
• net/include/icmp_remote.h (deleted)
• net/include/il_skel.h (deleted)
• net/include/ip_client.h (deleted)
• net/include/ip_header.h (deleted)
• net/include/ip_interface.h (deleted)
• net/include/ip_remote.h (deleted)
• net/include/net_interface.h (deleted)
• net/include/nil_remote.h (deleted)
• net/include/nil_skel.h (deleted)
• net/include/packet_client.h (deleted)
• net/include/socket_core.h (modified) (view diffs)
• net/include/tl_common.h (deleted)
• net/include/tl_skel.h (deleted)
• net/nil/nil_skel.c (deleted)
• net/tl/icmp_client.c (deleted)
• net/tl/icmp_remote.c (deleted)
• net/tl/socket_core.c (modified) (view diffs)
• net/tl/tl_common.c (deleted)
• net/tl/tl_remote.c (deleted)
• net/tl/tl_skel.c (deleted)
• nic/include/nic.h (modified) (view diffs)
• nic/include/nic_impl.h (modified) (view diffs)
• nic/src/nic_driver.c (modified) (view diffs)
• nic/src/nic_ev.c (modified) (view diffs)
• posix/Makefile (modified) (view diffs)
• posix/errno.h (modified) (view diffs)
• posix/getopt.c (moved) (moved from uspace/lib/net/nil/nil_remote.c ) (view diffs)
• posix/getopt.h (moved) (moved from uspace/srv/net/tl/udp/udp_header.h ) (view diffs)
• posix/pwd.c (modified) (view diffs)
• posix/stdbool.h (modified) (view diffs)
• posix/stdio.h (modified) (view diffs)
• posix/time.c (modified) (view diffs)
• posix/unistd.c (modified) (view diffs)
• posix/unistd.h (modified) (view diffs)
• usb/include/usb/ddfiface.h (modified) (view diffs)
• usb/include/usb/debug.h (modified) (view diffs)
• usb/src/ddfiface.c (modified) (view diffs)
• usb/src/hc.c (modified) (view diffs)
• usbdev/include/usb/dev/driver.h (modified) (view diffs)
• usbdev/include/usb/dev/hub.h (modified) (view diffs)
• usbdev/include/usb/dev/recognise.h (modified) (view diffs)
• usbdev/src/altiface.c (modified) (view diffs)
• usbdev/src/hub.c (modified) (view diffs)
• usbdev/src/recognise.c (modified) (view diffs)
• usbhid/src/hidiface.c (modified) (view diffs)
• usbhost/include/usb/host/hcd.h (modified) (view diffs)
• usbhost/include/usb/host/usb_transfer_batch.h (modified) (view diffs)
• usbhost/src/iface.c (modified) (view diffs)
• usbvirt/src/device.c (modified) (view diffs)
• usbvirt/src/ipc_hc.c (modified) (view diffs)