From: Yu Watanabe Date: Wed, 13 Apr 2022 18:45:39 +0000 (+0900) Subject: Merge pull request #23070 from poettering/devnum-split X-Git-Tag: v251-rc2~130 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd1f75d5fb929bd15f25d4834d8d325db25ad0fc;p=thirdparty%2Fsystemd.git Merge pull request #23070 from poettering/devnum-split basic: some devnum handling tweaks and refactorings --- bd1f75d5fb929bd15f25d4834d8d325db25ad0fc diff --cc src/libsystemd/sd-device/sd-device.c index fb50a688b08,22f16b9edc1..bbd990bdb4b --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@@ -12,8 -12,8 +12,9 @@@ #include "device-internal.h" #include "device-private.h" #include "device-util.h" + #include "devnum-util.h" #include "dirent-util.h" +#include "env-util.h" #include "fd-util.h" #include "fileio.h" #include "format-util.h"