merge: merge branch 'systemd' into master

System Internals / NetworkManager - Beniamino Galvani [redhat.com] - 8 October 2015 07:14 UTC

90fb640 merge: merge branch 'systemd' into master

configure.ac | 1 +
src/Makefile.am | 28 +-
src/devices/nm-device.c | 2 +-
src/dhcp-manager/nm-dhcp-systemd.c | 18 +-
src/systemd/nm-sd-adapt.h | 11 +-
src/systemd/src/basic/fileio.c | 40 +-
src/systemd/src/basic/fileio.h | 2 +-
src/systemd/src/basic/hashmap.c | 1865 ++++++++++++++++++++
src/systemd/src/basic/hashmap.h | 415 +++++
src/systemd/src/basic/log.h | 12 +
src/systemd/src/basic/macro.h | 39 +-
src/systemd/src/basic/mempool.c | 105 ++
src/systemd/src/basic/mempool.h | 51 +
src/systemd/src/basic/prioq.c | 320 ++++
src/systemd/src/basic/prioq.h | 44 +
src/systemd/src/basic/set.h | 138 ++
src/systemd/src/basic/siphash24.c | 244 +--
src/systemd/src/basic/siphash24.h | 13 +
src/systemd/src/basic/strv.c | 72 +-
src/systemd/src/basic/strv.h | 6 +
src/systemd/src/basic/time-util.h | 4 +-
src/systemd/src/basic/util.c | 375 ++--
src/systemd/src/basic/util.h | 75 +-
src/systemd/src/libsystemd-network/arp-util.c | 155 ++
src/systemd/src/libsystemd-network/arp-util.h | 36 +
.../src/libsystemd-network/ipv4ll-internal.h | 40 -
.../src/libsystemd-network/ipv4ll-network.c | 93 -
src/systemd/src/libsystemd-network/ipv4ll-packet.c | 74 -
src/systemd/src/libsystemd-network/lldp-internal.c | 362 ++++
src/systemd/src/libsystemd-network/lldp-internal.h | 94 +
src/systemd/src/libsystemd-network/lldp-network.c | 86 +
src/systemd/src/libsystemd-network/lldp-network.h | 29 +
src/systemd/src/libsystemd-network/lldp-port.c | 119 ++
src/systemd/src/libsystemd-network/lldp-port.h | 73 +
src/systemd/src/libsystemd-network/lldp-tlv.c | 649 +++++++
src/systemd/src/libsystemd-network/lldp-tlv.h | 101 ++
src/systemd/src/libsystemd-network/lldp-util.h | 28 +
src/systemd/src/libsystemd-network/lldp.h | 130 ++
.../src/libsystemd-network/network-internal.c | 16 +-
.../src/libsystemd-network/sd-dhcp-client.c | 20 +-
src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 8 +-
.../src/libsystemd-network/sd-dhcp6-client.c | 48 +-
src/systemd/src/libsystemd-network/sd-ipv4acd.c | 531 ++++++
src/systemd/src/libsystemd-network/sd-ipv4ll.c | 642 ++-----
src/systemd/src/libsystemd-network/sd-lldp.c | 736 ++++++++
src/systemd/src/libsystemd/sd-event/event-util.h | 33 +
src/systemd/src/libsystemd/sd-id128/sd-id128.c | 2 +-
src/systemd/src/shared/dns-domain.c | 11 +-
src/systemd/src/shared/dns-domain.h | 2 +-
src/systemd/src/systemd/sd-dhcp-client.h | 10 +-
src/systemd/src/systemd/sd-dhcp6-client.h | 10 +-
src/systemd/src/systemd/sd-icmp6-nd.h | 14 +-
src/systemd/src/systemd/sd-ipv4acd.h | 57 +
src/systemd/src/systemd/sd-ipv4ll.h | 8 +-
src/systemd/src/systemd/sd-lldp.h | 76 +
55 files changed, 7096 insertions(+), 1077 deletions(-)

Upstream: cgit.freedesktop.org

  • Share