Merge pull request #15206 from anitazha/systoomd-v0

systemd-oomd

diff --cc meson.build
Simple merge

diff --cc src/basic/meson.build
index d144bc2f87b465e870069e2bc1d960a04fb7d44b,748ad3ab61c095195c77d8f6684a9b67d570c456..09eb612c3af03aadd37a9763299e72d121effd98
--- 1/src/basic/meson.build
--- 2/src/basic/meson.build
+++ b/src/basic/meson.build
@@@ -108,9 -106,9 +108,10 @@@ basic_sources = files(''
          linux/if_tunnel.h
          linux/in.h
          linux/in6.h
 +        linux/ipv6_route.h
          linux/l2tp.h
          linux/libc-compat.h
+         linux/loadavg.h
          linux/netdevice.h
          linux/netlink.h
          linux/rtnetlink.h

diff --cc src/core/dbus-cgroup.c
Simple merge

diff --cc src/core/manager.c
Simple merge

diff --cc src/core/service.c
Simple merge

diff --cc src/shared/bus-unit-util.c
Simple merge

diff --cc src/shared/meson.build
Simple merge