https://launchpad.net/~roguescholar/+archive/ubuntu/systemd-daily/+recipebuild/2772633 RUN: /usr/share/launchpad-buildd/bin/builder-prep Kernel version: Linux lcy01-amd64-030 4.15.0-140-generic #144-Ubuntu SMP Fri Mar 19 14:12:35 UTC 2021 x86_64 Buildd toolchain package versions: launchpad-buildd_195~480~ubuntu18.04.1 python3-lpbuildd_195~480~ubuntu18.04.1 sbuild_0.75.0-1ubuntu1 bzr-builder_0.7.3+bzr174~ppa13~ubuntu16.04.1 bzr_2.7.0+bzr6622-10 git-build-recipe_0.3.6~git201906051340.ff11471~ubuntu18.04.1 git_1:2.17.1-1ubuntu0.8 dpkg-dev_1.19.0.5ubuntu2.3 python-debian_0.1.32 python3-debian_0.1.32. Syncing the system clock with the buildd NTP service... 9 Apr 11:31:48 ntpdate[1794]: adjust time server 10.211.37.1 offset -0.005458 sec RUN: /usr/share/launchpad-buildd/bin/in-target unpack-chroot --backend=chroot --series=groovy --arch=amd64 RECIPEBRANCHBUILD-2772633 --image-type chroot /home/buildd/filecache-default/20f824f72d640d2ced4a53a84e89958befe66512 Creating target for build RECIPEBRANCHBUILD-2772633 RUN: /usr/share/launchpad-buildd/bin/in-target mount-chroot --backend=chroot --series=groovy --arch=amd64 RECIPEBRANCHBUILD-2772633 Starting target for build RECIPEBRANCHBUILD-2772633 RUN: /usr/share/launchpad-buildd/bin/in-target override-sources-list --backend=chroot --series=groovy --arch=amd64 RECIPEBRANCHBUILD-2772633 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy main' 'deb http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy main' 'deb http://ppa.launchpad.net/savoury1/build-tools/ubuntu groovy main' 'deb http://ftpmaster.internal/ubuntu groovy main restricted universe multiverse' 'deb http://ftpmaster.internal/ubuntu groovy-security main restricted universe multiverse' 'deb http://ftpmaster.internal/ubuntu groovy-updates main restricted universe multiverse' 'deb http://ftpmaster.internal/ubuntu groovy-backports main restricted universe multiverse' Overriding sources.list in build-RECIPEBRANCHBUILD-2772633 RUN: /usr/share/launchpad-buildd/bin/in-target add-trusted-keys --backend=chroot --series=groovy --arch=amd64 RECIPEBRANCHBUILD-2772633 Adding trusted keys to build-RECIPEBRANCHBUILD-2772633 Warning: apt-key output should not be parsed (stdout is not a terminal) OK Warning: apt-key output should not be parsed (stdout is not a terminal) /etc/apt/trusted.gpg -------------------- pub rsa1024 2009-10-22 [SC] 60C3 1780 3A41 BA51 845E 371A 1E93 77A2 BA9E F27F uid [ unknown] Launchpad Toolchain builds pub rsa4096 2019-08-19 [SC] E996 7359 27E4 27A7 33BB 653E 374C 7797 FB00 6459 uid [ unknown] Launchpad PPA for Rob Savoury /etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg ------------------------------------------------------ pub rsa4096 2012-05-11 [SC] 8439 38DF 228D 22F7 B374 2BC0 D94A A3F0 EFE2 1092 uid [ unknown] Ubuntu CD Image Automatic Signing Key (2012) /etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg ------------------------------------------------------ pub rsa4096 2018-09-17 [SC] F6EC B376 2474 EDA9 D21B 7022 8719 20D1 991B C93C uid [ unknown] Ubuntu Archive Automatic Signing Key (2018) RUN: /usr/share/launchpad-buildd/bin/in-target update-debian-chroot --backend=chroot --series=groovy --arch=amd64 RECIPEBRANCHBUILD-2772633 Updating target for build RECIPEBRANCHBUILD-2772633 Get:1 http://ftpmaster.internal/ubuntu groovy InRelease [267 kB] Get:2 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy InRelease [17.5 kB] Get:3 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy InRelease [18.1 kB] Get:4 http://ppa.launchpad.net/savoury1/build-tools/ubuntu groovy InRelease [18.1 kB] Get:5 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 Packages [16.0 kB] Get:6 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main Translation-en [7008 B] Get:7 http://ftpmaster.internal/ubuntu groovy-security InRelease [110 kB] Get:8 http://ftpmaster.internal/ubuntu groovy-updates InRelease [115 kB] Get:9 http://ftpmaster.internal/ubuntu groovy-backports InRelease [101 kB] Get:10 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main amd64 Packages [7284 B] Get:11 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main Translation-en [5488 B] Get:12 http://ppa.launchpad.net/savoury1/build-tools/ubuntu groovy/main amd64 Packages [13.8 kB] Get:13 http://ppa.launchpad.net/savoury1/build-tools/ubuntu groovy/main Translation-en [10.7 kB] Get:14 http://ftpmaster.internal/ubuntu groovy/main amd64 Packages [1378 kB] Get:15 http://ftpmaster.internal/ubuntu groovy/main Translation-en [507 kB] Get:16 http://ftpmaster.internal/ubuntu groovy/restricted amd64 Packages [57.7 kB] Get:17 http://ftpmaster.internal/ubuntu groovy/restricted Translation-en [9404 B] Get:18 http://ftpmaster.internal/ubuntu groovy/universe amd64 Packages [12.6 MB] Get:19 http://ftpmaster.internal/ubuntu groovy/universe Translation-en [5262 kB] Get:20 http://ftpmaster.internal/ubuntu groovy/multiverse amd64 Packages [202 kB] Get:21 http://ftpmaster.internal/ubuntu groovy/multiverse Translation-en [106 kB] Get:22 http://ftpmaster.internal/ubuntu groovy-security/main amd64 Packages [253 kB] Get:23 http://ftpmaster.internal/ubuntu groovy-security/main Translation-en [61.7 kB] Get:24 http://ftpmaster.internal/ubuntu groovy-security/restricted amd64 Packages [111 kB] Get:25 http://ftpmaster.internal/ubuntu groovy-security/restricted Translation-en [16.5 kB] Get:26 http://ftpmaster.internal/ubuntu groovy-security/universe amd64 Packages [64.3 kB] Get:27 http://ftpmaster.internal/ubuntu groovy-security/universe Translation-en [29.2 kB] Get:28 http://ftpmaster.internal/ubuntu groovy-security/multiverse amd64 Packages [8000 B] Get:29 http://ftpmaster.internal/ubuntu groovy-security/multiverse Translation-en [2320 B] Get:30 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 Packages [405 kB] Get:31 http://ftpmaster.internal/ubuntu groovy-updates/main Translation-en [102 kB] Get:32 http://ftpmaster.internal/ubuntu groovy-updates/restricted amd64 Packages [133 kB] Get:33 http://ftpmaster.internal/ubuntu groovy-updates/restricted Translation-en [20.1 kB] Get:34 http://ftpmaster.internal/ubuntu groovy-updates/universe amd64 Packages [157 kB] Get:35 http://ftpmaster.internal/ubuntu groovy-updates/universe Translation-en [61.2 kB] Get:36 http://ftpmaster.internal/ubuntu groovy-updates/multiverse amd64 Packages [13.9 kB] Get:37 http://ftpmaster.internal/ubuntu groovy-updates/multiverse Translation-en [4012 B] Get:38 http://ftpmaster.internal/ubuntu groovy-backports/universe amd64 Packages [3924 B] Get:39 http://ftpmaster.internal/ubuntu groovy-backports/universe Translation-en [1324 B] Fetched 22.3 MB in 6s (3983 kB/s) Reading package lists... Reading package lists... Building dependency tree... Reading state information... Calculating upgrade... The following packages were automatically installed and are no longer required: libffi7 libjson-c4 Use 'sudo apt autoremove' to remove them. The following NEW packages will be installed: libffi8ubuntu1 libgssapi-krb5-2 libjson-c5 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libnsl-dev libnsl2 libnss-nis libnss-nisplus libtirpc-common libtirpc-dev libtirpc3 rpcsvc-proto The following packages will be upgraded: apt base-files binutils binutils-common binutils-x86-64-linux-gnu bsdutils build-essential ca-certificates coreutils cpp cpp-10 debianutils diffutils dpkg dpkg-dev fakeroot findutils g++ g++-10 gcc gcc-10 gcc-10-base gpg gpg-agent gpgconf gpgv gzip libapparmor1 libapt-pkg6.0 libasan6 libassuan0 libatomic1 libaudit-common libaudit1 libbinutils libblkid1 libc-bin libc-dev-bin libc6 libc6-dev libcap2 libcc1-0 libcryptsetup12 libctf-nobfd0 libctf0 libdb5.3 libdpkg-perl libfakeroot libgcc-10-dev libgcc-s1 libgcrypt20 libgdbm-compat4 libgdbm6 libgmp10 libgnutls30 libgomp1 libgpg-error0 libip4tc2 libitm1 liblsan0 liblzma5 libmount1 libmpc3 libmpfr6 libp11-kit0 libpam-modules libpam-modules-bin libpam-runtime libpam0g libpng16-16 libprocps8 libquadmath0 libseccomp2 libselinux1 libsemanage-common libsemanage1 libsmartcols1 libsqlite3-0 libssl1.1 libstdc++-10-dev libstdc++6 libsystemd0 libtsan0 libubsan1 libudev1 libuuid1 libzstd1 linux-libc-dev mount openssl procps sed sensible-utils systemd systemd-sysv systemd-timesyncd tar tzdata ubuntu-keyring util-linux xz-utils zlib1g 102 upgraded, 15 newly installed, 0 to remove and 0 not upgraded. Need to get 245 MB of archives. After this operation, 890 MB of additional disk space will be used. Get:1 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libkrb5support0 amd64 1.17-10ubuntu0.1 [30.7 kB] Get:2 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libcc1-0 amd64 10.2.0-16ubuntu1.1 [41.3 kB] Get:3 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libk5crypto3 amd64 1.17-10ubuntu0.1 [79.0 kB] Get:4 http://ftpmaster.internal/ubuntu groovy/main amd64 libkeyutils1 amd64 1.6.1-2ubuntu1 [10.1 kB] Get:5 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libssl1.1 amd64 1.1.1f-1ubuntu4.3 [1325 kB] Get:6 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 gcc-10-base amd64 10.2.0-16ubuntu1.1 [19.5 kB] Get:7 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libgcc-s1 amd64 10.2.0-16ubuntu1.1 [41.7 kB] Get:8 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libgomp1 amd64 10.2.0-16ubuntu1.1 [102 kB] Get:9 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libitm1 amd64 10.2.0-16ubuntu1.1 [26.4 kB] Get:10 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libkrb5-3 amd64 1.17-10ubuntu0.1 [332 kB] Get:11 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libgssapi-krb5-2 amd64 1.17-10ubuntu0.1 [121 kB] Get:12 http://ftpmaster.internal/ubuntu groovy/main amd64 libtirpc-common all 1.2.6-1build1 [7472 B] Get:13 http://ftpmaster.internal/ubuntu groovy/main amd64 libtirpc3 amd64 1.2.6-1build1 [77.0 kB] Get:14 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libatomic1 amd64 10.2.0-16ubuntu1.1 [9288 B] Get:15 http://ftpmaster.internal/ubuntu groovy/main amd64 libnsl2 amd64 1.3.0-0ubuntu3 [39.5 kB] Get:16 http://ftpmaster.internal/ubuntu groovy/main amd64 libnss-nis amd64 3.1-0ubuntu4 [25.3 kB] Get:17 http://ftpmaster.internal/ubuntu groovy/main amd64 libnss-nisplus amd64 1.3-0ubuntu4 [21.7 kB] Get:18 http://ftpmaster.internal/ubuntu groovy/main amd64 libc6 amd64 2.32-0ubuntu3 [2683 kB] Get:19 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libasan6 amd64 10.2.0-16ubuntu1.1 [344 kB] Get:20 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 liblsan0 amd64 10.2.0-16ubuntu1.1 [144 kB] Get:21 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libtsan0 amd64 10.2.0-16ubuntu1.1 [319 kB] Get:22 http://ftpmaster.internal/ubuntu groovy/main amd64 libc-dev-bin amd64 2.32-0ubuntu3 [30.9 kB] Get:23 http://ftpmaster.internal/ubuntu groovy/main amd64 libc6-dev amd64 2.32-0ubuntu3 [2130 kB] Get:24 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libubsan1 amd64 10.2.0-16ubuntu1.1 [136 kB] Get:25 http://ftpmaster.internal/ubuntu groovy/main amd64 rpcsvc-proto amd64 1.4.2-0ubuntu4 [62.8 kB] Get:26 http://ftpmaster.internal/ubuntu groovy/main amd64 libtirpc-dev amd64 1.2.6-1build1 [184 kB] Get:27 http://ftpmaster.internal/ubuntu groovy/main amd64 libnsl-dev amd64 1.3.0-0ubuntu3 [66.4 kB] Get:28 http://ftpmaster.internal/ubuntu groovy/main amd64 libc-bin amd64 2.32-0ubuntu3 [628 kB] Get:29 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libquadmath0 amd64 10.2.0-16ubuntu1.1 [146 kB] Get:30 http://ftpmaster.internal/ubuntu groovy-security/main amd64 linux-libc-dev amd64 5.8.0-48.54 [1173 kB] Get:31 http://ftpmaster.internal/ubuntu groovy/main amd64 libctf0 amd64 2.35.1-1ubuntu1 [47.6 kB] Get:32 http://ftpmaster.internal/ubuntu groovy/main amd64 libctf-nobfd0 amd64 2.35.1-1ubuntu1 [48.1 kB] Get:33 http://ftpmaster.internal/ubuntu groovy/main amd64 binutils-x86-64-linux-gnu amd64 2.35.1-1ubuntu1 [1645 kB] Get:34 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 g++-10 amd64 10.2.0-16ubuntu1.1 [70.2 MB] Get:35 http://ftpmaster.internal/ubuntu groovy/main amd64 libbinutils amd64 2.35.1-1ubuntu1 [481 kB] Get:36 http://ftpmaster.internal/ubuntu groovy/main amd64 binutils-common amd64 2.35.1-1ubuntu1 [212 kB] Get:37 http://ftpmaster.internal/ubuntu groovy/main amd64 binutils amd64 2.35.1-1ubuntu1 [3380 B] Get:38 http://ftpmaster.internal/ubuntu groovy/main amd64 zlib1g amd64 1:1.2.11.dfsg-2ubuntu4 [54.4 kB] Get:39 http://ftpmaster.internal/ubuntu groovy/main amd64 libgmp10 amd64 2:6.2.0+dfsg-6ubuntu1 [238 kB] Get:40 http://ftpmaster.internal/ubuntu groovy/main amd64 libmpfr6 amd64 4.1.0-3 [1401 kB] Get:41 http://ftpmaster.internal/ubuntu groovy/main amd64 libmpc3 amd64 1.2.0~rc1-1 [44.3 kB] Get:42 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libzstd1 amd64 1.4.5+dfsg-4ubuntu0.1 [294 kB] Get:43 http://ftpmaster.internal/ubuntu groovy/main amd64 base-files amd64 11ubuntu14 [60.5 kB] Get:44 http://ftpmaster.internal/ubuntu groovy/main amd64 bsdutils amd64 1:2.36-3ubuntu1 [86.9 kB] Get:45 http://ftpmaster.internal/ubuntu groovy/main amd64 libselinux1 amd64 3.1-2 [68.8 kB] Get:46 http://ftpmaster.internal/ubuntu groovy/main amd64 coreutils amd64 8.32-3ubuntu1 [1355 kB] Get:47 http://ftpmaster.internal/ubuntu groovy/main amd64 debianutils amd64 4.11.2 [85.6 kB] Get:48 http://ftpmaster.internal/ubuntu groovy/main amd64 diffutils amd64 1:3.7-3ubuntu1 [196 kB] Get:49 http://ftpmaster.internal/ubuntu groovy-security/main amd64 tar amd64 1.30+dfsg-7ubuntu0.20.10.1 [242 kB] Get:50 http://ftpmaster.internal/ubuntu groovy/main amd64 dpkg amd64 1.20.5ubuntu2 [1172 kB] Get:51 http://ftpmaster.internal/ubuntu groovy/main amd64 findutils amd64 4.7.0-1ubuntu2 [329 kB] Get:52 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 gzip amd64 1.10-2ubuntu1.1 [95.6 kB] Get:53 http://ftpmaster.internal/ubuntu groovy/main amd64 sed amd64 4.7-1ubuntu1 [190 kB] Get:54 http://ftpmaster.internal/ubuntu groovy/main amd64 util-linux amd64 2.36-3ubuntu1 [1068 kB] Get:55 http://ftpmaster.internal/ubuntu groovy/main amd64 liblzma5 amd64 5.2.4-1ubuntu1 [91.7 kB] Get:56 http://ftpmaster.internal/ubuntu groovy/main amd64 libffi8ubuntu1 amd64 3.4~20200819gead65ca871-0ubuntu3 [20.0 kB] Get:57 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libp11-kit0 amd64 0.23.21-2ubuntu0.1 [196 kB] Get:58 http://ftpmaster.internal/ubuntu groovy/main amd64 libgnutls30 amd64 3.6.15-4ubuntu2 [770 kB] Get:59 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 systemd-sysv amd64 246.6-1ubuntu1.3 [10.3 kB] Get:60 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 systemd-timesyncd amd64 246.6-1ubuntu1.3 [28.3 kB] Get:61 http://ftpmaster.internal/ubuntu groovy/main amd64 libapparmor1 amd64 3.0.0-0ubuntu1 [36.2 kB] Get:62 http://ftpmaster.internal/ubuntu groovy/main amd64 libaudit-common all 1:2.8.5-3ubuntu1 [4076 B] Get:63 http://ftpmaster.internal/ubuntu groovy/main amd64 libaudit1 amd64 1:2.8.5-3ubuntu1 [39.4 kB] Get:64 http://ftpmaster.internal/ubuntu groovy/main amd64 libcap2 amd64 1:2.43-1 [17.7 kB] Get:65 http://ftpmaster.internal/ubuntu groovy/main amd64 libjson-c5 amd64 0.15-1 [31.3 kB] Get:66 http://ftpmaster.internal/ubuntu groovy/main amd64 libblkid1 amd64 2.36-3ubuntu1 [133 kB] Get:67 http://ftpmaster.internal/ubuntu groovy/main amd64 libuuid1 amd64 2.36-3ubuntu1 [21.7 kB] Get:68 http://ftpmaster.internal/ubuntu groovy/main amd64 libcryptsetup12 amd64 2:2.3.3-1ubuntu6 [194 kB] Get:69 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 libip4tc2 amd64 1.8.5-3ubuntu2.20.10.2 [18.7 kB] Get:70 http://ftpmaster.internal/ubuntu groovy/main amd64 libmount1 amd64 2.36-3ubuntu1 [149 kB] Get:71 http://ftpmaster.internal/ubuntu groovy/main amd64 libpam0g amd64 1.3.1-5ubuntu6 [56.1 kB] Get:72 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 libseccomp2 amd64 2.5.1-1ubuntu1~20.10.1 [43.1 kB] Get:73 http://ftpmaster.internal/ubuntu groovy/main amd64 mount amd64 2.36-3ubuntu1 [121 kB] Get:74 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 systemd amd64 246.6-1ubuntu1.3 [4166 kB] Get:75 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 libsystemd0 amd64 246.6-1ubuntu1.3 [274 kB] Get:76 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 libudev1 amd64 246.6-1ubuntu1.3 [68.0 kB] Get:77 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 libapt-pkg6.0 amd64 2.1.10ubuntu0.3 [852 kB] Get:78 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 ubuntu-keyring all 2020.06.17.3 [21.9 kB] Get:79 http://ftpmaster.internal/ubuntu groovy-updates/main amd64 apt amd64 2.1.10ubuntu0.3 [1309 kB] Get:80 http://ftpmaster.internal/ubuntu groovy/main amd64 libpam-modules-bin amd64 1.3.1-5ubuntu6 [38.0 kB] Get:81 http://ftpmaster.internal/ubuntu groovy/main amd64 libpam-modules amd64 1.3.1-5ubuntu6 [250 kB] Get:82 http://ftpmaster.internal/ubuntu groovy/main amd64 libdb5.3 amd64 5.3.28+dfsg1-0.6ubuntu3 [675 kB] Get:83 http://ftpmaster.internal/ubuntu groovy/main amd64 libpam-runtime all 1.3.1-5ubuntu6 [37.3 kB] Get:84 http://ftpmaster.internal/ubuntu groovy/main amd64 libsemanage-common all 3.1-1 [10.2 kB] Get:85 http://ftpmaster.internal/ubuntu groovy/main amd64 libsemanage1 amd64 3.1-1 [86.2 kB] Get:86 http://ftpmaster.internal/ubuntu groovy/main amd64 libsmartcols1 amd64 2.36-3ubuntu1 [96.8 kB] Get:87 http://ftpmaster.internal/ubuntu groovy/main amd64 libprocps8 amd64 2:3.3.16-5ubuntu2 [32.9 kB] Get:88 http://ftpmaster.internal/ubuntu groovy/main amd64 procps amd64 2:3.3.16-5ubuntu2 [233 kB] Get:89 http://ftpmaster.internal/ubuntu groovy/main amd64 sensible-utils all 0.0.13 [15.1 kB] Get:90 http://ftpmaster.internal/ubuntu groovy-security/main amd64 openssl amd64 1.1.1f-1ubuntu4.3 [621 kB] Get:91 http://ftpmaster.internal/ubuntu groovy-security/main amd64 ca-certificates all 20210119~20.10.1 [147 kB] Get:92 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libsqlite3-0 amd64 3.33.0-1ubuntu0.1 [585 kB] Get:93 http://ftpmaster.internal/ubuntu groovy-security/main amd64 tzdata all 2021a-0ubuntu0.20.10 [295 kB] Get:94 http://ftpmaster.internal/ubuntu groovy/main amd64 xz-utils amd64 5.2.4-1ubuntu1 [82.5 kB] Get:95 http://ftpmaster.internal/ubuntu groovy/main amd64 libgdbm6 amd64 1.18.1-5.1 [27.4 kB] Get:96 http://ftpmaster.internal/ubuntu groovy/main amd64 libpng16-16 amd64 1.6.37-3 [181 kB] Get:97 http://ftpmaster.internal/ubuntu groovy/main amd64 g++ amd64 4:10.2.0-1ubuntu1 [1608 B] Get:98 http://ftpmaster.internal/ubuntu groovy/main amd64 gcc amd64 4:10.2.0-1ubuntu1 [5208 B] Get:99 http://ftpmaster.internal/ubuntu groovy/main amd64 cpp amd64 4:10.2.0-1ubuntu1 [27.7 kB] Get:100 http://ftpmaster.internal/ubuntu groovy/main amd64 dpkg-dev all 1.20.5ubuntu2 [758 kB] Get:101 http://ftpmaster.internal/ubuntu groovy/main amd64 libdpkg-perl all 1.20.5ubuntu2 [232 kB] Get:102 http://ftpmaster.internal/ubuntu groovy/main amd64 build-essential amd64 12.8ubuntu3 [4640 B] Get:103 http://ftpmaster.internal/ubuntu groovy/main amd64 libfakeroot amd64 1.25.2-1 [26.6 kB] Get:104 http://ftpmaster.internal/ubuntu groovy/main amd64 fakeroot amd64 1.25.2-1 [62.8 kB] Get:105 http://ftpmaster.internal/ubuntu groovy/main amd64 libgdbm-compat4 amd64 1.18.1-5.1 [6244 B] Get:106 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libstdc++-10-dev amd64 10.2.0-16ubuntu1.1 [1750 kB] Get:107 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libgcc-10-dev amd64 10.2.0-16ubuntu1.1 [2342 kB] Get:108 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 gcc-10 amd64 10.2.0-16ubuntu1.1 [71.9 MB] Get:109 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 cpp-10 amd64 10.2.0-16ubuntu1.1 [63.4 MB] Get:110 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu groovy/main amd64 libstdc++6 amd64 10.2.0-16ubuntu1.1 [502 kB] Get:111 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main amd64 libgpg-error0 amd64 1.41-0ubuntu1~20.10.sav0 [79.1 kB] Get:112 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main amd64 libgcrypt20 amd64 1.8.7-3ubuntu0~20.10.sav0 [439 kB] Get:113 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main amd64 gpgv amd64 2.2.27-1ubuntu0~20.10.sav0 [225 kB] Get:114 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main amd64 libassuan0 amd64 2.5.4-0ubuntu1~20.10.sav0 [38.5 kB] Get:115 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main amd64 gpg amd64 2.2.27-1ubuntu0~20.10.sav0 [527 kB] Get:116 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main amd64 gpgconf amd64 2.2.27-1ubuntu0~20.10.sav0 [146 kB] Get:117 http://ppa.launchpad.net/savoury1/gpg/ubuntu groovy/main amd64 gpg-agent amd64 2.2.27-1ubuntu0~20.10.sav0 [268 kB] debconf: delaying package configuration, since apt-utils is not installed Fetched 245 MB in 10s (25.2 MB/s) Selecting previously unselected package libkrb5support0:amd64. (Reading database ... 12787 files and directories currently installed.) Preparing to unpack .../libkrb5support0_1.17-10ubuntu0.1_amd64.deb ... Unpacking libkrb5support0:amd64 (1.17-10ubuntu0.1) ... Setting up libkrb5support0:amd64 (1.17-10ubuntu0.1) ... Selecting previously unselected package libk5crypto3:amd64. (Reading database ... 12792 files and directories currently installed.) Preparing to unpack .../libk5crypto3_1.17-10ubuntu0.1_amd64.deb ... Unpacking libk5crypto3:amd64 (1.17-10ubuntu0.1) ... Setting up libk5crypto3:amd64 (1.17-10ubuntu0.1) ... Selecting previously unselected package libkeyutils1:amd64. (Reading database ... 12797 files and directories currently installed.) Preparing to unpack .../libkeyutils1_1.6.1-2ubuntu1_amd64.deb ... Unpacking libkeyutils1:amd64 (1.6.1-2ubuntu1) ... Setting up libkeyutils1:amd64 (1.6.1-2ubuntu1) ... (Reading database ... 12802 files and directories currently installed.) Preparing to unpack .../libssl1.1_1.1.1f-1ubuntu4.3_amd64.deb ... Unpacking libssl1.1:amd64 (1.1.1f-1ubuntu4.3) over (1.1.1f-1ubuntu3) ... Setting up libssl1.1:amd64 (1.1.1f-1ubuntu4.3) ... Selecting previously unselected package libkrb5-3:amd64. (Reading database ... 12802 files and directories currently installed.) Preparing to unpack .../libkrb5-3_1.17-10ubuntu0.1_amd64.deb ... Unpacking libkrb5-3:amd64 (1.17-10ubuntu0.1) ... Setting up libkrb5-3:amd64 (1.17-10ubuntu0.1) ... Selecting previously unselected package libgssapi-krb5-2:amd64. (Reading database ... 12815 files and directories currently installed.) Preparing to unpack .../libgssapi-krb5-2_1.17-10ubuntu0.1_amd64.deb ... Unpacking libgssapi-krb5-2:amd64 (1.17-10ubuntu0.1) ... Setting up libgssapi-krb5-2:amd64 (1.17-10ubuntu0.1) ... Selecting previously unselected package libtirpc-common. (Reading database ... 12823 files and directories currently installed.) Preparing to unpack .../libtirpc-common_1.2.6-1build1_all.deb ... Unpacking libtirpc-common (1.2.6-1build1) ... Setting up libtirpc-common (1.2.6-1build1) ... Selecting previously unselected package libtirpc3:amd64. (Reading database ... 12828 files and directories currently installed.) Preparing to unpack .../libtirpc3_1.2.6-1build1_amd64.deb ... Unpacking libtirpc3:amd64 (1.2.6-1build1) ... Setting up libtirpc3:amd64 (1.2.6-1build1) ... Selecting previously unselected package libnsl2:amd64. (Reading database ... 12833 files and directories currently installed.) Preparing to unpack .../libnsl2_1.3.0-0ubuntu3_amd64.deb ... Unpacking libnsl2:amd64 (1.3.0-0ubuntu3) ... Setting up libnsl2:amd64 (1.3.0-0ubuntu3) ... (Reading database ... 12838 files and directories currently installed.) Preparing to unpack .../libc6_2.32-0ubuntu3_amd64.deb ... Unpacking libc6:amd64 (2.32-0ubuntu3) over (2.31-0ubuntu10) ... Selecting previously unselected package libnss-nis:amd64. Preparing to unpack .../libnss-nis_3.1-0ubuntu4_amd64.deb ... Unpacking libnss-nis:amd64 (3.1-0ubuntu4) ... Selecting previously unselected package libnss-nisplus:amd64. Preparing to unpack .../libnss-nisplus_1.3-0ubuntu4_amd64.deb ... Unpacking libnss-nisplus:amd64 (1.3-0ubuntu4) ... Setting up libnss-nis:amd64 (3.1-0ubuntu4) ... Setting up libnss-nisplus:amd64 (1.3-0ubuntu4) ... Setting up libc6:amd64 (2.32-0ubuntu3) ... (Reading database ... 12846 files and directories currently installed.) Preparing to unpack .../0-libc-dev-bin_2.32-0ubuntu3_amd64.deb ... Unpacking libc-dev-bin (2.32-0ubuntu3) over (2.31-0ubuntu10) ... Preparing to unpack .../1-libc6-dev_2.32-0ubuntu3_amd64.deb ... Unpacking libc6-dev:amd64 (2.32-0ubuntu3) over (2.31-0ubuntu10) ... Selecting previously unselected package rpcsvc-proto. Preparing to unpack .../2-rpcsvc-proto_1.4.2-0ubuntu4_amd64.deb ... Unpacking rpcsvc-proto (1.4.2-0ubuntu4) ... Selecting previously unselected package libtirpc-dev:amd64. Preparing to unpack .../3-libtirpc-dev_1.2.6-1build1_amd64.deb ... Unpacking libtirpc-dev:amd64 (1.2.6-1build1) ... Selecting previously unselected package libnsl-dev:amd64. Preparing to unpack .../4-libnsl-dev_1.3.0-0ubuntu3_amd64.deb ... Unpacking libnsl-dev:amd64 (1.3.0-0ubuntu3) ... Preparing to unpack .../5-libc-bin_2.32-0ubuntu3_amd64.deb ... Unpacking libc-bin (2.32-0ubuntu3) over (2.31-0ubuntu10) ... Setting up libc-bin (2.32-0ubuntu3) ... (Reading database ... 12911 files and directories currently installed.) Preparing to unpack .../0-linux-libc-dev_5.8.0-48.54_amd64.deb ... Unpacking linux-libc-dev:amd64 (5.8.0-48.54) over (5.4.0-42.46) ... Preparing to unpack .../1-libcc1-0_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libcc1-0:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../2-libctf0_2.35.1-1ubuntu1_amd64.deb ... Unpacking libctf0:amd64 (2.35.1-1ubuntu1) over (2.35-1ubuntu1) ... Preparing to unpack .../3-libctf-nobfd0_2.35.1-1ubuntu1_amd64.deb ... Unpacking libctf-nobfd0:amd64 (2.35.1-1ubuntu1) over (2.35-1ubuntu1) ... Preparing to unpack .../4-binutils-x86-64-linux-gnu_2.35.1-1ubuntu1_amd64.deb ... Unpacking binutils-x86-64-linux-gnu (2.35.1-1ubuntu1) over (2.35-1ubuntu1) ... Preparing to unpack .../5-libbinutils_2.35.1-1ubuntu1_amd64.deb ... Unpacking libbinutils:amd64 (2.35.1-1ubuntu1) over (2.35-1ubuntu1) ... Preparing to unpack .../6-binutils-common_2.35.1-1ubuntu1_amd64.deb ... Unpacking binutils-common:amd64 (2.35.1-1ubuntu1) over (2.35-1ubuntu1) ... Preparing to unpack .../7-binutils_2.35.1-1ubuntu1_amd64.deb ... Unpacking binutils (2.35.1-1ubuntu1) over (2.35-1ubuntu1) ... Preparing to unpack .../8-gcc-10-base_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking gcc-10-base:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Setting up gcc-10-base:amd64 (10.2.0-16ubuntu1.1) ... (Reading database ... 12925 files and directories currently installed.) Preparing to unpack .../libgcc-s1_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libgcc-s1:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Setting up libgcc-s1:amd64 (10.2.0-16ubuntu1.1) ... (Reading database ... 12925 files and directories currently installed.) Preparing to unpack .../00-libgomp1_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libgomp1:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../01-libitm1_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libitm1:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../02-libatomic1_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libatomic1:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../03-libasan6_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libasan6:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../04-liblsan0_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking liblsan0:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../05-libtsan0_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libtsan0:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../06-libubsan1_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libubsan1:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../07-libquadmath0_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libquadmath0:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../08-g++-10_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking g++-10 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../09-libstdc++-10-dev_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libstdc++-10-dev:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../10-libgcc-10-dev_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libgcc-10-dev:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../11-gcc-10_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking gcc-10 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../12-cpp-10_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking cpp-10 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Preparing to unpack .../13-libstdc++6_10.2.0-16ubuntu1.1_amd64.deb ... Unpacking libstdc++6:amd64 (10.2.0-16ubuntu1.1) over (10.2.0-3ubuntu1) ... Setting up libstdc++6:amd64 (10.2.0-16ubuntu1.1) ... (Reading database ... 12926 files and directories currently installed.) Preparing to unpack .../zlib1g_1%3a1.2.11.dfsg-2ubuntu4_amd64.deb ... Unpacking zlib1g:amd64 (1:1.2.11.dfsg-2ubuntu4) over (1:1.2.11.dfsg-2ubuntu1) ... Setting up zlib1g:amd64 (1:1.2.11.dfsg-2ubuntu4) ... (Reading database ... 12926 files and directories currently installed.) Preparing to unpack .../libgmp10_2%3a6.2.0+dfsg-6ubuntu1_amd64.deb ... Unpacking libgmp10:amd64 (2:6.2.0+dfsg-6ubuntu1) over (2:6.2.0+dfsg-6) ... Setting up libgmp10:amd64 (2:6.2.0+dfsg-6ubuntu1) ... (Reading database ... 12926 files and directories currently installed.) Preparing to unpack .../libmpfr6_4.1.0-3_amd64.deb ... Unpacking libmpfr6:amd64 (4.1.0-3) over (4.0.2-1build1) ... Preparing to unpack .../libmpc3_1.2.0~rc1-1_amd64.deb ... Unpacking libmpc3:amd64 (1.2.0~rc1-1) over (1.1.0-1) ... Preparing to unpack .../libzstd1_1.4.5+dfsg-4ubuntu0.1_amd64.deb ... Unpacking libzstd1:amd64 (1.4.5+dfsg-4ubuntu0.1) over (1.4.5+dfsg-3) ... Setting up libzstd1:amd64 (1.4.5+dfsg-4ubuntu0.1) ... (Reading database ... 12926 files and directories currently installed.) Preparing to unpack .../base-files_11ubuntu14_amd64.deb ... Unpacking base-files (11ubuntu14) over (11ubuntu9) ... Setting up base-files (11ubuntu14) ... Installing new version of config file /etc/issue ... Installing new version of config file /etc/issue.net ... Installing new version of config file /etc/lsb-release ... Installing new version of config file /etc/update-motd.d/50-motd-news ... Removing obsolete conffile /etc/default/motd-news ... (Reading database ... 12925 files and directories currently installed.) Preparing to unpack .../bsdutils_1%3a2.36-3ubuntu1_amd64.deb ... Unpacking bsdutils (1:2.36-3ubuntu1) over (1:2.35.2-7ubuntu3) ... Setting up bsdutils (1:2.36-3ubuntu1) ... (Reading database ... 12925 files and directories currently installed.) Preparing to unpack .../libselinux1_3.1-2_amd64.deb ... Unpacking libselinux1:amd64 (3.1-2) over (3.0-1build2) ... Setting up libselinux1:amd64 (3.1-2) ... (Reading database ... 12925 files and directories currently installed.) Preparing to unpack .../coreutils_8.32-3ubuntu1_amd64.deb ... Unpacking coreutils (8.32-3ubuntu1) over (8.30-3ubuntu3) ... Setting up coreutils (8.32-3ubuntu1) ... (Reading database ... 13023 files and directories currently installed.) Preparing to unpack .../debianutils_4.11.2_amd64.deb ... Unpacking debianutils (4.11.2) over (4.11) ... Setting up debianutils (4.11.2) ... (Reading database ... 13023 files and directories currently installed.) Preparing to unpack .../diffutils_1%3a3.7-3ubuntu1_amd64.deb ... Unpacking diffutils (1:3.7-3ubuntu1) over (1:3.7-3build1) ... Setting up diffutils (1:3.7-3ubuntu1) ... (Reading database ... 13023 files and directories currently installed.) Preparing to unpack .../tar_1.30+dfsg-7ubuntu0.20.10.1_amd64.deb ... Unpacking tar (1.30+dfsg-7ubuntu0.20.10.1) over (1.30+dfsg-7) ... Setting up tar (1.30+dfsg-7ubuntu0.20.10.1) ... (Reading database ... 13023 files and directories currently installed.) Preparing to unpack .../dpkg_1.20.5ubuntu2_amd64.deb ... Unpacking dpkg (1.20.5ubuntu2) over (1.19.7ubuntu4) ... Setting up dpkg (1.20.5ubuntu2) ... Installing new version of config file /etc/cron.daily/dpkg ... (Reading database ... 13032 files and directories currently installed.) Preparing to unpack .../findutils_4.7.0-1ubuntu2_amd64.deb ... Unpacking findutils (4.7.0-1ubuntu2) over (4.7.0-1ubuntu1) ... Setting up findutils (4.7.0-1ubuntu2) ... (Reading database ... 13032 files and directories currently installed.) Preparing to unpack .../gzip_1.10-2ubuntu1.1_amd64.deb ... Unpacking gzip (1.10-2ubuntu1.1) over (1.10-2ubuntu1) ... Setting up gzip (1.10-2ubuntu1.1) ... (Reading database ... 13032 files and directories currently installed.) Preparing to unpack .../sed_4.7-1ubuntu1_amd64.deb ... Unpacking sed (4.7-1ubuntu1) over (4.7-1build1) ... Setting up sed (4.7-1ubuntu1) ... (Reading database ... 13032 files and directories currently installed.) Preparing to unpack .../util-linux_2.36-3ubuntu1_amd64.deb ... Unpacking util-linux (2.36-3ubuntu1) over (2.35.2-7ubuntu3) ... Setting up util-linux (2.36-3ubuntu1) ... (Reading database ... 13031 files and directories currently installed.) Preparing to unpack .../libgpg-error0_1.41-0ubuntu1~20.10.sav0_amd64.deb ... Unpacking libgpg-error0:amd64 (1.41-0ubuntu1~20.10.sav0) over (1.38-2) ... Setting up libgpg-error0:amd64 (1.41-0ubuntu1~20.10.sav0) ... (Reading database ... 13032 files and directories currently installed.) Preparing to unpack .../libgcrypt20_1.8.7-3ubuntu0~20.10.sav0_amd64.deb ... Unpacking libgcrypt20:amd64 (1.8.7-3ubuntu0~20.10.sav0) over (1.8.5-5ubuntu2) ... Setting up libgcrypt20:amd64 (1.8.7-3ubuntu0~20.10.sav0) ... (Reading database ... 13032 files and directories currently installed.) Preparing to unpack .../liblzma5_5.2.4-1ubuntu1_amd64.deb ... Unpacking liblzma5:amd64 (5.2.4-1ubuntu1) over (5.2.4-1) ... Setting up liblzma5:amd64 (5.2.4-1ubuntu1) ... Selecting previously unselected package libffi8ubuntu1:amd64. (Reading database ... 13032 files and directories currently installed.) Preparing to unpack .../libffi8ubuntu1_3.4~20200819gead65ca871-0ubuntu3_amd64.deb ... Unpacking libffi8ubuntu1:amd64 (3.4~20200819gead65ca871-0ubuntu3) ... Setting up libffi8ubuntu1:amd64 (3.4~20200819gead65ca871-0ubuntu3) ... (Reading database ... 13037 files and directories currently installed.) Preparing to unpack .../libp11-kit0_0.23.21-2ubuntu0.1_amd64.deb ... Unpacking libp11-kit0:amd64 (0.23.21-2ubuntu0.1) over (0.23.20-1build1) ... Setting up libp11-kit0:amd64 (0.23.21-2ubuntu0.1) ... (Reading database ... 13037 files and directories currently installed.) Preparing to unpack .../libgnutls30_3.6.15-4ubuntu2_amd64.deb ... Unpacking libgnutls30:amd64 (3.6.15-4ubuntu2) over (3.6.13-4ubuntu4) ... Setting up libgnutls30:amd64 (3.6.15-4ubuntu2) ... (Reading database ... 13037 files and directories currently installed.) Preparing to unpack .../systemd-sysv_246.6-1ubuntu1.3_amd64.deb ... Unpacking systemd-sysv (246.6-1ubuntu1.3) over (245.6-3ubuntu3) ... Preparing to unpack .../systemd-timesyncd_246.6-1ubuntu1.3_amd64.deb ... Unpacking systemd-timesyncd (246.6-1ubuntu1.3) over (245.6-3ubuntu3) ... Preparing to unpack .../libapparmor1_3.0.0-0ubuntu1_amd64.deb ... Unpacking libapparmor1:amd64 (3.0.0-0ubuntu1) over (2.13.3-7ubuntu6) ... Preparing to unpack .../libaudit-common_1%3a2.8.5-3ubuntu1_all.deb ... Unpacking libaudit-common (1:2.8.5-3ubuntu1) over (1:2.8.5-2ubuntu6) ... Setting up libaudit-common (1:2.8.5-3ubuntu1) ... (Reading database ... 13037 files and directories currently installed.) Preparing to unpack .../libaudit1_1%3a2.8.5-3ubuntu1_amd64.deb ... Unpacking libaudit1:amd64 (1:2.8.5-3ubuntu1) over (1:2.8.5-2ubuntu6) ... Setting up libaudit1:amd64 (1:2.8.5-3ubuntu1) ... (Reading database ... 13037 files and directories currently installed.) Preparing to unpack .../libcap2_1%3a2.43-1_amd64.deb ... Unpacking libcap2:amd64 (1:2.43-1) over (1:2.36-1) ... Selecting previously unselected package libjson-c5:amd64. Preparing to unpack .../libjson-c5_0.15-1_amd64.deb ... Unpacking libjson-c5:amd64 (0.15-1) ... Preparing to unpack .../libblkid1_2.36-3ubuntu1_amd64.deb ... Unpacking libblkid1:amd64 (2.36-3ubuntu1) over (2.35.2-7ubuntu3) ... Setting up libblkid1:amd64 (2.36-3ubuntu1) ... (Reading database ... 13044 files and directories currently installed.) Preparing to unpack .../libuuid1_2.36-3ubuntu1_amd64.deb ... Unpacking libuuid1:amd64 (2.36-3ubuntu1) over (2.35.2-7ubuntu3) ... Setting up libuuid1:amd64 (2.36-3ubuntu1) ... (Reading database ... 13044 files and directories currently installed.) Preparing to unpack .../libcryptsetup12_2%3a2.3.3-1ubuntu6_amd64.deb ... Unpacking libcryptsetup12:amd64 (2:2.3.3-1ubuntu6) over (2:2.3.3-1ubuntu3) ... Preparing to unpack .../libip4tc2_1.8.5-3ubuntu2.20.10.2_amd64.deb ... Unpacking libip4tc2:amd64 (1.8.5-3ubuntu2.20.10.2) over (1.8.4-3ubuntu2) ... Preparing to unpack .../libmount1_2.36-3ubuntu1_amd64.deb ... Unpacking libmount1:amd64 (2.36-3ubuntu1) over (2.35.2-7ubuntu3) ... Setting up libmount1:amd64 (2.36-3ubuntu1) ... (Reading database ... 13044 files and directories currently installed.) Preparing to unpack .../libpam0g_1.3.1-5ubuntu6_amd64.deb ... Unpacking libpam0g:amd64 (1.3.1-5ubuntu6) over (1.3.1-5ubuntu5) ... Setting up libpam0g:amd64 (1.3.1-5ubuntu6) ... (Reading database ... 13044 files and directories currently installed.) Preparing to unpack .../libseccomp2_2.5.1-1ubuntu1~20.10.1_amd64.deb ... Unpacking libseccomp2:amd64 (2.5.1-1ubuntu1~20.10.1) over (2.4.3-1ubuntu4) ... Setting up libseccomp2:amd64 (2.5.1-1ubuntu1~20.10.1) ... (Reading database ... 13044 files and directories currently installed.) Preparing to unpack .../mount_2.36-3ubuntu1_amd64.deb ... Unpacking mount (2.36-3ubuntu1) over (2.35.2-7ubuntu3) ... Preparing to unpack .../systemd_246.6-1ubuntu1.3_amd64.deb ... Unpacking systemd (246.6-1ubuntu1.3) over (245.6-3ubuntu3) ... dpkg: warning: unable to delete old directory '/etc/dhcp/dhclient-enter-hooks.d': Directory not empty Preparing to unpack .../libsystemd0_246.6-1ubuntu1.3_amd64.deb ... Unpacking libsystemd0:amd64 (246.6-1ubuntu1.3) over (245.6-3ubuntu3) ... Setting up libsystemd0:amd64 (246.6-1ubuntu1.3) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libudev1_246.6-1ubuntu1.3_amd64.deb ... Unpacking libudev1:amd64 (246.6-1ubuntu1.3) over (245.6-3ubuntu3) ... Setting up libudev1:amd64 (246.6-1ubuntu1.3) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libapt-pkg6.0_2.1.10ubuntu0.3_amd64.deb ... Unpacking libapt-pkg6.0:amd64 (2.1.10ubuntu0.3) over (2.1.7) ... Setting up libapt-pkg6.0:amd64 (2.1.10ubuntu0.3) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../gpgv_2.2.27-1ubuntu0~20.10.sav0_amd64.deb ... Unpacking gpgv (2.2.27-1ubuntu0~20.10.sav0) over (2.2.20-1ubuntu1) ... Setting up gpgv (2.2.27-1ubuntu0~20.10.sav0) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../ubuntu-keyring_2020.06.17.3_all.deb ... Unpacking ubuntu-keyring (2020.06.17.3) over (2020.06.17.1) ... Setting up ubuntu-keyring (2020.06.17.3) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../apt_2.1.10ubuntu0.3_amd64.deb ... Unpacking apt (2.1.10ubuntu0.3) over (2.1.7) ... Setting up apt (2.1.10ubuntu0.3) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libpam-modules-bin_1.3.1-5ubuntu6_amd64.deb ... Unpacking libpam-modules-bin (1.3.1-5ubuntu6) over (1.3.1-5ubuntu5) ... Setting up libpam-modules-bin (1.3.1-5ubuntu6) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libpam-modules_1.3.1-5ubuntu6_amd64.deb ... Unpacking libpam-modules:amd64 (1.3.1-5ubuntu6) over (1.3.1-5ubuntu5) ... Setting up libpam-modules:amd64 (1.3.1-5ubuntu6) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libdb5.3_5.3.28+dfsg1-0.6ubuntu3_amd64.deb ... Unpacking libdb5.3:amd64 (5.3.28+dfsg1-0.6ubuntu3) over (5.3.28+dfsg1-0.6ubuntu2) ... Setting up libdb5.3:amd64 (5.3.28+dfsg1-0.6ubuntu3) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libpam-runtime_1.3.1-5ubuntu6_all.deb ... Unpacking libpam-runtime (1.3.1-5ubuntu6) over (1.3.1-5ubuntu5) ... Setting up libpam-runtime (1.3.1-5ubuntu6) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libsemanage-common_3.1-1_all.deb ... Unpacking libsemanage-common (3.1-1) over (3.0-1build2) ... Setting up libsemanage-common (3.1-1) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libsemanage1_3.1-1_amd64.deb ... Unpacking libsemanage1:amd64 (3.1-1) over (3.0-1build2) ... Setting up libsemanage1:amd64 (3.1-1) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../libsmartcols1_2.36-3ubuntu1_amd64.deb ... Unpacking libsmartcols1:amd64 (2.36-3ubuntu1) over (2.35.2-7ubuntu3) ... Setting up libsmartcols1:amd64 (2.36-3ubuntu1) ... (Reading database ... 13059 files and directories currently installed.) Preparing to unpack .../00-libprocps8_2%3a3.3.16-5ubuntu2_amd64.deb ... Unpacking libprocps8:amd64 (2:3.3.16-5ubuntu2) over (2:3.3.16-5ubuntu1) ... Preparing to unpack .../01-procps_2%3a3.3.16-5ubuntu2_amd64.deb ... Unpacking procps (2:3.3.16-5ubuntu2) over (2:3.3.16-5ubuntu1) ... Preparing to unpack .../02-sensible-utils_0.0.13_all.deb ... Unpacking sensible-utils (0.0.13) over (0.0.12+nmu1) ... Preparing to unpack .../03-openssl_1.1.1f-1ubuntu4.3_amd64.deb ... Unpacking openssl (1.1.1f-1ubuntu4.3) over (1.1.1f-1ubuntu3) ... Preparing to unpack .../04-ca-certificates_20210119~20.10.1_all.deb ... Unpacking ca-certificates (20210119~20.10.1) over (20190110ubuntu2) ... Preparing to unpack .../05-libsqlite3-0_3.33.0-1ubuntu0.1_amd64.deb ... Unpacking libsqlite3-0:amd64 (3.33.0-1ubuntu0.1) over (3.32.3-1) ... Preparing to unpack .../06-tzdata_2021a-0ubuntu0.20.10_all.deb ... Unpacking tzdata (2021a-0ubuntu0.20.10) over (2020a-0ubuntu1) ... Preparing to unpack .../07-xz-utils_5.2.4-1ubuntu1_amd64.deb ... Unpacking xz-utils (5.2.4-1ubuntu1) over (5.2.4-1) ... Preparing to unpack .../08-libgdbm6_1.18.1-5.1_amd64.deb ... Unpacking libgdbm6:amd64 (1.18.1-5.1) over (1.18.1-5) ... Preparing to unpack .../09-libpng16-16_1.6.37-3_amd64.deb ... Unpacking libpng16-16:amd64 (1.6.37-3) over (1.6.37-2) ... Preparing to unpack .../10-g++_4%3a10.2.0-1ubuntu1_amd64.deb ... Unpacking g++ (4:10.2.0-1ubuntu1) over (4:10.1.0-1ubuntu1) ... Preparing to unpack .../11-gcc_4%3a10.2.0-1ubuntu1_amd64.deb ... Unpacking gcc (4:10.2.0-1ubuntu1) over (4:10.1.0-1ubuntu1) ... Preparing to unpack .../12-cpp_4%3a10.2.0-1ubuntu1_amd64.deb ... Unpacking cpp (4:10.2.0-1ubuntu1) over (4:10.1.0-1ubuntu1) ... Preparing to unpack .../13-dpkg-dev_1.20.5ubuntu2_all.deb ... Unpacking dpkg-dev (1.20.5ubuntu2) over (1.19.7ubuntu4) ... Preparing to unpack .../14-libdpkg-perl_1.20.5ubuntu2_all.deb ... Unpacking libdpkg-perl (1.20.5ubuntu2) over (1.19.7ubuntu4) ... Preparing to unpack .../15-build-essential_12.8ubuntu3_amd64.deb ... Unpacking build-essential (12.8ubuntu3) over (12.8ubuntu1) ... Preparing to unpack .../16-libfakeroot_1.25.2-1_amd64.deb ... Unpacking libfakeroot:amd64 (1.25.2-1) over (1.24-1) ... Preparing to unpack .../17-fakeroot_1.25.2-1_amd64.deb ... Unpacking fakeroot (1.25.2-1) over (1.24-1) ... Preparing to unpack .../18-libassuan0_2.5.4-0ubuntu1~20.10.sav0_amd64.deb ... Unpacking libassuan0:amd64 (2.5.4-0ubuntu1~20.10.sav0) over (2.5.3-7.1) ... Preparing to unpack .../19-gpg_2.2.27-1ubuntu0~20.10.sav0_amd64.deb ... Unpacking gpg (2.2.27-1ubuntu0~20.10.sav0) over (2.2.20-1ubuntu1) ... Preparing to unpack .../20-gpgconf_2.2.27-1ubuntu0~20.10.sav0_amd64.deb ... Unpacking gpgconf (2.2.27-1ubuntu0~20.10.sav0) over (2.2.20-1ubuntu1) ... Preparing to unpack .../21-gpg-agent_2.2.27-1ubuntu0~20.10.sav0_amd64.deb ... Unpacking gpg-agent (2.2.27-1ubuntu0~20.10.sav0) over (2.2.20-1ubuntu1) ... Preparing to unpack .../22-libgdbm-compat4_1.18.1-5.1_amd64.deb ... Unpacking libgdbm-compat4:amd64 (1.18.1-5.1) over (1.18.1-5) ... Setting up libip4tc2:amd64 (1.8.5-3ubuntu2.20.10.2) ... Setting up libapparmor1:amd64 (3.0.0-0ubuntu1) ... Setting up libsqlite3-0:amd64 (3.33.0-1ubuntu0.1) ... Setting up binutils-common:amd64 (2.35.1-1ubuntu1) ... Setting up linux-libc-dev:amd64 (5.8.0-48.54) ... Setting up libctf-nobfd0:amd64 (2.35.1-1ubuntu1) ... Setting up libassuan0:amd64 (2.5.4-0ubuntu1~20.10.sav0) ... Setting up libgomp1:amd64 (10.2.0-16ubuntu1.1) ... Setting up libcap2:amd64 (1:2.43-1) ... Setting up libfakeroot:amd64 (1.25.2-1) ... Setting up libasan6:amd64 (10.2.0-16ubuntu1.1) ... Setting up tzdata (2021a-0ubuntu0.20.10) ... Current default time zone: 'Etc/UTC' Local time is now: Fri Apr 9 11:34:16 UTC 2021. Universal Time is now: Fri Apr 9 11:34:16 UTC 2021. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up fakeroot (1.25.2-1) ... Setting up libtirpc-dev:amd64 (1.2.6-1build1) ... Setting up rpcsvc-proto (1.4.2-0ubuntu4) ... Setting up libmpfr6:amd64 (4.1.0-3) ... Setting up xz-utils (5.2.4-1ubuntu1) ... Setting up libquadmath0:amd64 (10.2.0-16ubuntu1.1) ... Setting up libpng16-16:amd64 (1.6.37-3) ... Setting up libmpc3:amd64 (1.2.0~rc1-1) ... Setting up libatomic1:amd64 (10.2.0-16ubuntu1.1) ... Setting up libdpkg-perl (1.20.5ubuntu2) ... Setting up libubsan1:amd64 (10.2.0-16ubuntu1.1) ... Setting up mount (2.36-3ubuntu1) ... Setting up libnsl-dev:amd64 (1.3.0-0ubuntu3) ... Setting up sensible-utils (0.0.13) ... Setting up gpgconf (2.2.27-1ubuntu0~20.10.sav0) ... Setting up libbinutils:amd64 (2.35.1-1ubuntu1) ... Setting up libc-dev-bin (2.32-0ubuntu3) ... Setting up openssl (1.1.1f-1ubuntu4.3) ... Setting up libjson-c5:amd64 (0.15-1) ... Setting up libcc1-0:amd64 (10.2.0-16ubuntu1.1) ... Setting up gpg (2.2.27-1ubuntu0~20.10.sav0) ... Setting up liblsan0:amd64 (10.2.0-16ubuntu1.1) ... Setting up libprocps8:amd64 (2:3.3.16-5ubuntu2) ... Setting up cpp-10 (10.2.0-16ubuntu1.1) ... Setting up libitm1:amd64 (10.2.0-16ubuntu1.1) ... Setting up libgdbm6:amd64 (1.18.1-5.1) ... Setting up libtsan0:amd64 (10.2.0-16ubuntu1.1) ... Setting up libctf0:amd64 (2.35.1-1ubuntu1) ... Setting up gpg-agent (2.2.27-1ubuntu0~20.10.sav0) ... Setting up libgcc-10-dev:amd64 (10.2.0-16ubuntu1.1) ... Setting up ca-certificates (20210119~20.10.1) ... Updating certificates in /etc/ssl/certs... 21 added, 19 removed; done. Setting up libgdbm-compat4:amd64 (1.18.1-5.1) ... Setting up cpp (4:10.2.0-1ubuntu1) ... Setting up procps (2:3.3.16-5ubuntu2) ... Installing new version of config file /etc/sysctl.d/10-kernel-hardening.conf ... Setting up libc6-dev:amd64 (2.32-0ubuntu3) ... Setting up libcryptsetup12:amd64 (2:2.3.3-1ubuntu6) ... Setting up binutils-x86-64-linux-gnu (2.35.1-1ubuntu1) ... Setting up libstdc++-10-dev:amd64 (10.2.0-16ubuntu1.1) ... Setting up binutils (2.35.1-1ubuntu1) ... Setting up dpkg-dev (1.20.5ubuntu2) ... Setting up gcc-10 (10.2.0-16ubuntu1.1) ... Setting up g++-10 (10.2.0-16ubuntu1.1) ... Setting up gcc (4:10.2.0-1ubuntu1) ... Setting up g++ (4:10.2.0-1ubuntu1) ... Setting up build-essential (12.8ubuntu3) ... Setting up systemd (246.6-1ubuntu1.3) ... Installing new version of config file /etc/systemd/logind.conf ... Installing new version of config file /etc/systemd/networkd.conf ... Installing new version of config file /etc/systemd/resolved.conf ... Installing new version of config file /etc/systemd/system.conf ... Installing new version of config file /etc/systemd/user.conf ... Initializing machine ID from random generator. Removing obsolete conffile /etc/dhcp/dhclient-enter-hooks.d/resolved ... Setting up systemd-timesyncd (246.6-1ubuntu1.3) ... Setting up systemd-sysv (246.6-1ubuntu1.3) ... Processing triggers for libc-bin (2.32-0ubuntu3) ... Processing triggers for ca-certificates (20210119~20.10.1) ... Updating certificates in /etc/ssl/certs... 0 added, 0 removed; done. Running hooks in /etc/ca-certificates/update.d... done. RUN: /usr/share/launchpad-buildd/bin/buildrecipe --git RECIPEBRANCHBUILD-2772633 'Peter J. Mello' admin@petermello.net groovy groovy universe PPA Reading package lists... Building dependency tree... Reading state information... The following packages were automatically installed and are no longer required: libffi7 libjson-c4 Use 'sudo apt autoremove' to remove them. The following additional packages will be installed: distro-info-data libexpat1 libpython3-stdlib libpython3.8-minimal libpython3.8-stdlib mime-support python3 python3-minimal python3.8 python3.8-minimal Suggested packages: python3-doc python3-tk python3-venv python3.8-venv python3.8-doc binfmt-support Recommended packages: file The following NEW packages will be installed: distro-info-data libexpat1 libpython3-stdlib libpython3.8-minimal libpython3.8-stdlib lsb-release mime-support python3 python3-minimal python3.8 python3.8-minimal 0 upgraded, 11 newly installed, 0 to remove and 0 not upgraded. Need to get 4841 kB of archives. After this operation, 20.0 MB of additional disk space will be used. Get:1 http://ppa.launchpad.net/savoury1/build-tools/ubuntu groovy/main amd64 distro-info-data all 0.46+20.10.sav0 [7272 B] Get:2 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libpython3.8-minimal amd64 3.8.6-1ubuntu0.2 [715 kB] Get:3 http://ftpmaster.internal/ubuntu groovy/main amd64 libexpat1 amd64 2.2.9-1build1 [73.3 kB] Get:4 http://ftpmaster.internal/ubuntu groovy-security/main amd64 python3.8-minimal amd64 3.8.6-1ubuntu0.2 [1824 kB] Get:5 http://ftpmaster.internal/ubuntu groovy/main amd64 python3-minimal amd64 3.8.6-0ubuntu1 [23.6 kB] Get:6 http://ftpmaster.internal/ubuntu groovy/main amd64 mime-support all 3.64ubuntu1 [30.6 kB] Get:7 http://ftpmaster.internal/ubuntu groovy-security/main amd64 libpython3.8-stdlib amd64 3.8.6-1ubuntu0.2 [1726 kB] Get:8 http://ftpmaster.internal/ubuntu groovy-security/main amd64 python3.8 amd64 3.8.6-1ubuntu0.2 [376 kB] Get:9 http://ftpmaster.internal/ubuntu groovy/main amd64 libpython3-stdlib amd64 3.8.6-0ubuntu1 [7084 B] Get:10 http://ftpmaster.internal/ubuntu groovy/main amd64 python3 amd64 3.8.6-0ubuntu1 [47.6 kB] Get:11 http://ftpmaster.internal/ubuntu groovy/main amd64 lsb-release all 11.1.0ubuntu2 [10.6 kB] debconf: delaying package configuration, since apt-utils is not installed Fetched 4841 kB in 0s (41.6 MB/s) Selecting previously unselected package libpython3.8-minimal:amd64. (Reading database ... 12996 files and directories currently installed.) Preparing to unpack .../libpython3.8-minimal_3.8.6-1ubuntu0.2_amd64.deb ... Unpacking libpython3.8-minimal:amd64 (3.8.6-1ubuntu0.2) ... Selecting previously unselected package libexpat1:amd64. Preparing to unpack .../libexpat1_2.2.9-1build1_amd64.deb ... Unpacking libexpat1:amd64 (2.2.9-1build1) ... Selecting previously unselected package python3.8-minimal. Preparing to unpack .../python3.8-minimal_3.8.6-1ubuntu0.2_amd64.deb ... Unpacking python3.8-minimal (3.8.6-1ubuntu0.2) ... Setting up libpython3.8-minimal:amd64 (3.8.6-1ubuntu0.2) ... Setting up libexpat1:amd64 (2.2.9-1build1) ... Setting up python3.8-minimal (3.8.6-1ubuntu0.2) ... Selecting previously unselected package python3-minimal. (Reading database ... 13287 files and directories currently installed.) Preparing to unpack .../python3-minimal_3.8.6-0ubuntu1_amd64.deb ... Unpacking python3-minimal (3.8.6-0ubuntu1) ... Selecting previously unselected package mime-support. Preparing to unpack .../mime-support_3.64ubuntu1_all.deb ... Unpacking mime-support (3.64ubuntu1) ... Selecting previously unselected package libpython3.8-stdlib:amd64. Preparing to unpack .../libpython3.8-stdlib_3.8.6-1ubuntu0.2_amd64.deb ... Unpacking libpython3.8-stdlib:amd64 (3.8.6-1ubuntu0.2) ... Selecting previously unselected package python3.8. Preparing to unpack .../python3.8_3.8.6-1ubuntu0.2_amd64.deb ... Unpacking python3.8 (3.8.6-1ubuntu0.2) ... Selecting previously unselected package libpython3-stdlib:amd64. Preparing to unpack .../libpython3-stdlib_3.8.6-0ubuntu1_amd64.deb ... Unpacking libpython3-stdlib:amd64 (3.8.6-0ubuntu1) ... Setting up python3-minimal (3.8.6-0ubuntu1) ... Selecting previously unselected package python3. (Reading database ... 13684 files and directories currently installed.) Preparing to unpack .../python3_3.8.6-0ubuntu1_amd64.deb ... Unpacking python3 (3.8.6-0ubuntu1) ... Selecting previously unselected package distro-info-data. Preparing to unpack .../distro-info-data_0.46+20.10.sav0_all.deb ... Unpacking distro-info-data (0.46+20.10.sav0) ... Selecting previously unselected package lsb-release. Preparing to unpack .../lsb-release_11.1.0ubuntu2_all.deb ... Unpacking lsb-release (11.1.0ubuntu2) ... Setting up mime-support (3.64ubuntu1) ... Setting up distro-info-data (0.46+20.10.sav0) ... Setting up libpython3.8-stdlib:amd64 (3.8.6-1ubuntu0.2) ... Setting up python3.8 (3.8.6-1ubuntu0.2) ... Setting up libpython3-stdlib:amd64 (3.8.6-0ubuntu1) ... Setting up python3 (3.8.6-0ubuntu1) ... running python rtupdate hooks for python3.8... running python post-rtupdate hooks for python3.8... Setting up lsb-release (11.1.0ubuntu2) ... Processing triggers for libc-bin (2.32-0ubuntu3) ... Git version: git version 2.17.1 git-build-recipe 0.3.6~git201906051340.ff11471~ubuntu18.04.1 Building recipe: # git-build-recipe format 0.4 deb-version {debupstream}+{date}-0daily{revno:packaging} lp:~roguescholar/systemd/+git/official master merge packaging lp:ubuntu/+source/systemd applied/ubuntu/devel RUN ['git-build-recipe', '--safe', '--no-build', '--manifest', '/home/buildd/build-RECIPEBRANCHBUILD-2772633/chroot-autobuild/home/buildd/work/tree/manifest', '--distribution', 'groovy', '--allow-fallback-to-native', '--append-version', '~ubuntu20.10.1', '/home/buildd/build-RECIPEBRANCHBUILD-2772633/chroot-autobuild/home/buildd/work/recipe', '/home/buildd/build-RECIPEBRANCHBUILD-2772633/chroot-autobuild/home/buildd/work/tree'] Initialized empty Git repository in /home/buildd/build-RECIPEBRANCHBUILD-2772633/chroot-autobuild/home/buildd/work/tree/recipe/.git/ From https://git.launchpad.net/~roguescholar/systemd/+git/official * [new branch] master -> source/master Note: checking out 'b3753406c0cd84e3a26ff115f6bc7aa870094c23'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b HEAD is now at b3753406c0 turn off fuzzit From https://git.launchpad.net/ubuntu/+source/systemd * [new branch] applied/debian/buster -> source-packaging/applied/debian/buster * [new branch] applied/debian/experimental -> source-packaging/applied/debian/experimental * [new branch] applied/debian/jessie -> source-packaging/applied/debian/jessie * [new branch] applied/debian/sid -> source-packaging/applied/debian/sid * [new branch] applied/debian/stretch -> source-packaging/applied/debian/stretch * [new branch] applied/debian/wheezy -> source-packaging/applied/debian/wheezy * [new branch] applied/ubuntu/artful -> source-packaging/applied/ubuntu/artful * [new branch] applied/ubuntu/artful-devel -> source-packaging/applied/ubuntu/artful-devel * [new branch] applied/ubuntu/artful-proposed -> source-packaging/applied/ubuntu/artful-proposed * [new branch] applied/ubuntu/artful-security -> source-packaging/applied/ubuntu/artful-security * [new branch] applied/ubuntu/artful-updates -> source-packaging/applied/ubuntu/artful-updates * [new branch] applied/ubuntu/bionic -> source-packaging/applied/ubuntu/bionic * [new branch] applied/ubuntu/bionic-devel -> source-packaging/applied/ubuntu/bionic-devel * [new branch] applied/ubuntu/bionic-proposed -> source-packaging/applied/ubuntu/bionic-proposed * [new branch] applied/ubuntu/bionic-security -> source-packaging/applied/ubuntu/bionic-security * [new branch] applied/ubuntu/bionic-updates -> source-packaging/applied/ubuntu/bionic-updates * [new branch] applied/ubuntu/cosmic -> source-packaging/applied/ubuntu/cosmic * [new branch] applied/ubuntu/cosmic-devel -> source-packaging/applied/ubuntu/cosmic-devel * [new branch] applied/ubuntu/cosmic-proposed -> source-packaging/applied/ubuntu/cosmic-proposed * [new branch] applied/ubuntu/cosmic-security -> source-packaging/applied/ubuntu/cosmic-security * [new branch] applied/ubuntu/cosmic-updates -> source-packaging/applied/ubuntu/cosmic-updates * [new branch] applied/ubuntu/devel -> source-packaging/applied/ubuntu/devel * [new branch] applied/ubuntu/disco -> source-packaging/applied/ubuntu/disco * [new branch] applied/ubuntu/disco-devel -> source-packaging/applied/ubuntu/disco-devel * [new branch] applied/ubuntu/disco-proposed -> source-packaging/applied/ubuntu/disco-proposed * [new branch] applied/ubuntu/disco-security -> source-packaging/applied/ubuntu/disco-security * [new branch] applied/ubuntu/disco-updates -> source-packaging/applied/ubuntu/disco-updates * [new branch] applied/ubuntu/eoan -> source-packaging/applied/ubuntu/eoan * [new branch] applied/ubuntu/eoan-devel -> source-packaging/applied/ubuntu/eoan-devel * [new branch] applied/ubuntu/eoan-proposed -> source-packaging/applied/ubuntu/eoan-proposed * [new branch] applied/ubuntu/eoan-security -> source-packaging/applied/ubuntu/eoan-security * [new branch] applied/ubuntu/eoan-updates -> source-packaging/applied/ubuntu/eoan-updates * [new branch] applied/ubuntu/focal -> source-packaging/applied/ubuntu/focal * [new branch] applied/ubuntu/focal-devel -> source-packaging/applied/ubuntu/focal-devel * [new branch] applied/ubuntu/focal-proposed -> source-packaging/applied/ubuntu/focal-proposed * [new branch] applied/ubuntu/focal-updates -> source-packaging/applied/ubuntu/focal-updates * [new branch] applied/ubuntu/groovy -> source-packaging/applied/ubuntu/groovy * [new branch] applied/ubuntu/groovy-devel -> source-packaging/applied/ubuntu/groovy-devel * [new branch] applied/ubuntu/groovy-proposed -> source-packaging/applied/ubuntu/groovy-proposed * [new branch] applied/ubuntu/groovy-updates -> source-packaging/applied/ubuntu/groovy-updates * [new branch] applied/ubuntu/hirsute -> source-packaging/applied/ubuntu/hirsute * [new branch] applied/ubuntu/hirsute-devel -> source-packaging/applied/ubuntu/hirsute-devel * [new branch] applied/ubuntu/hirsute-proposed -> source-packaging/applied/ubuntu/hirsute-proposed * [new branch] applied/ubuntu/raring -> source-packaging/applied/ubuntu/raring * [new branch] applied/ubuntu/raring-devel -> source-packaging/applied/ubuntu/raring-devel * [new branch] applied/ubuntu/raring-proposed -> source-packaging/applied/ubuntu/raring-proposed * [new branch] applied/ubuntu/raring-security -> source-packaging/applied/ubuntu/raring-security * [new branch] applied/ubuntu/raring-updates -> source-packaging/applied/ubuntu/raring-updates * [new branch] applied/ubuntu/saucy -> source-packaging/applied/ubuntu/saucy * [new branch] applied/ubuntu/saucy-devel -> source-packaging/applied/ubuntu/saucy-devel * [new branch] applied/ubuntu/saucy-proposed -> source-packaging/applied/ubuntu/saucy-proposed * [new branch] applied/ubuntu/saucy-updates -> source-packaging/applied/ubuntu/saucy-updates * [new branch] applied/ubuntu/trusty -> source-packaging/applied/ubuntu/trusty * [new branch] applied/ubuntu/trusty-devel -> source-packaging/applied/ubuntu/trusty-devel * [new branch] applied/ubuntu/trusty-proposed -> source-packaging/applied/ubuntu/trusty-proposed * [new branch] applied/ubuntu/trusty-security -> source-packaging/applied/ubuntu/trusty-security * [new branch] applied/ubuntu/trusty-updates -> source-packaging/applied/ubuntu/trusty-updates * [new branch] applied/ubuntu/utopic -> source-packaging/applied/ubuntu/utopic * [new branch] applied/ubuntu/utopic-devel -> source-packaging/applied/ubuntu/utopic-devel * [new branch] applied/ubuntu/utopic-proposed -> source-packaging/applied/ubuntu/utopic-proposed * [new branch] applied/ubuntu/utopic-updates -> source-packaging/applied/ubuntu/utopic-updates * [new branch] applied/ubuntu/vivid -> source-packaging/applied/ubuntu/vivid * [new branch] applied/ubuntu/vivid-devel -> source-packaging/applied/ubuntu/vivid-devel * [new branch] applied/ubuntu/vivid-proposed -> source-packaging/applied/ubuntu/vivid-proposed * [new branch] applied/ubuntu/vivid-updates -> source-packaging/applied/ubuntu/vivid-updates * [new branch] applied/ubuntu/wily -> source-packaging/applied/ubuntu/wily * [new branch] applied/ubuntu/wily-devel -> source-packaging/applied/ubuntu/wily-devel * [new branch] applied/ubuntu/wily-proposed -> source-packaging/applied/ubuntu/wily-proposed * [new branch] applied/ubuntu/wily-updates -> source-packaging/applied/ubuntu/wily-updates * [new branch] applied/ubuntu/xenial -> source-packaging/applied/ubuntu/xenial * [new branch] applied/ubuntu/xenial-devel -> source-packaging/applied/ubuntu/xenial-devel * [new branch] applied/ubuntu/xenial-proposed -> source-packaging/applied/ubuntu/xenial-proposed * [new branch] applied/ubuntu/xenial-security -> source-packaging/applied/ubuntu/xenial-security * [new branch] applied/ubuntu/xenial-updates -> source-packaging/applied/ubuntu/xenial-updates * [new branch] applied/ubuntu/yakkety -> source-packaging/applied/ubuntu/yakkety * [new branch] applied/ubuntu/yakkety-devel -> source-packaging/applied/ubuntu/yakkety-devel * [new branch] applied/ubuntu/yakkety-proposed -> source-packaging/applied/ubuntu/yakkety-proposed * [new branch] applied/ubuntu/yakkety-security -> source-packaging/applied/ubuntu/yakkety-security * [new branch] applied/ubuntu/yakkety-updates -> source-packaging/applied/ubuntu/yakkety-updates * [new branch] applied/ubuntu/zesty -> source-packaging/applied/ubuntu/zesty * [new branch] applied/ubuntu/zesty-devel -> source-packaging/applied/ubuntu/zesty-devel * [new branch] applied/ubuntu/zesty-proposed -> source-packaging/applied/ubuntu/zesty-proposed * [new branch] applied/ubuntu/zesty-security -> source-packaging/applied/ubuntu/zesty-security * [new branch] applied/ubuntu/zesty-updates -> source-packaging/applied/ubuntu/zesty-updates * [new branch] debian/buster -> source-packaging/debian/buster * [new branch] debian/experimental -> source-packaging/debian/experimental * [new branch] debian/jessie -> source-packaging/debian/jessie * [new branch] debian/sid -> source-packaging/debian/sid * [new branch] debian/stretch -> source-packaging/debian/stretch * [new branch] debian/wheezy -> source-packaging/debian/wheezy * [new branch] importer/debian/dsc -> source-packaging/importer/debian/dsc * [new branch] importer/debian/pristine-tar -> source-packaging/importer/debian/pristine-tar * [new branch] importer/ubuntu/dsc -> source-packaging/importer/ubuntu/dsc * [new branch] importer/ubuntu/pristine-tar -> source-packaging/importer/ubuntu/pristine-tar * [new branch] ubuntu/artful -> source-packaging/ubuntu/artful * [new branch] ubuntu/artful-devel -> source-packaging/ubuntu/artful-devel * [new branch] ubuntu/artful-proposed -> source-packaging/ubuntu/artful-proposed * [new branch] ubuntu/artful-security -> source-packaging/ubuntu/artful-security * [new branch] ubuntu/artful-updates -> source-packaging/ubuntu/artful-updates * [new branch] ubuntu/bionic -> source-packaging/ubuntu/bionic * [new branch] ubuntu/bionic-devel -> source-packaging/ubuntu/bionic-devel * [new branch] ubuntu/bionic-proposed -> source-packaging/ubuntu/bionic-proposed * [new branch] ubuntu/bionic-security -> source-packaging/ubuntu/bionic-security * [new branch] ubuntu/bionic-updates -> source-packaging/ubuntu/bionic-updates * [new branch] ubuntu/cosmic -> source-packaging/ubuntu/cosmic * [new branch] ubuntu/cosmic-devel -> source-packaging/ubuntu/cosmic-devel * [new branch] ubuntu/cosmic-proposed -> source-packaging/ubuntu/cosmic-proposed * [new branch] ubuntu/cosmic-security -> source-packaging/ubuntu/cosmic-security * [new branch] ubuntu/cosmic-updates -> source-packaging/ubuntu/cosmic-updates * [new branch] ubuntu/devel -> source-packaging/ubuntu/devel * [new branch] ubuntu/disco -> source-packaging/ubuntu/disco * [new branch] ubuntu/disco-devel -> source-packaging/ubuntu/disco-devel * [new branch] ubuntu/disco-proposed -> source-packaging/ubuntu/disco-proposed * [new branch] ubuntu/disco-security -> source-packaging/ubuntu/disco-security * [new branch] ubuntu/disco-updates -> source-packaging/ubuntu/disco-updates * [new branch] ubuntu/eoan -> source-packaging/ubuntu/eoan * [new branch] ubuntu/eoan-devel -> source-packaging/ubuntu/eoan-devel * [new branch] ubuntu/eoan-proposed -> source-packaging/ubuntu/eoan-proposed * [new branch] ubuntu/eoan-security -> source-packaging/ubuntu/eoan-security * [new branch] ubuntu/eoan-updates -> source-packaging/ubuntu/eoan-updates * [new branch] ubuntu/focal -> source-packaging/ubuntu/focal * [new branch] ubuntu/focal-devel -> source-packaging/ubuntu/focal-devel * [new branch] ubuntu/focal-proposed -> source-packaging/ubuntu/focal-proposed * [new branch] ubuntu/focal-updates -> source-packaging/ubuntu/focal-updates * [new branch] ubuntu/groovy -> source-packaging/ubuntu/groovy * [new branch] ubuntu/groovy-devel -> source-packaging/ubuntu/groovy-devel * [new branch] ubuntu/groovy-proposed -> source-packaging/ubuntu/groovy-proposed * [new branch] ubuntu/groovy-updates -> source-packaging/ubuntu/groovy-updates * [new branch] ubuntu/hirsute -> source-packaging/ubuntu/hirsute * [new branch] ubuntu/hirsute-devel -> source-packaging/ubuntu/hirsute-devel * [new branch] ubuntu/hirsute-proposed -> source-packaging/ubuntu/hirsute-proposed * [new branch] ubuntu/raring -> source-packaging/ubuntu/raring * [new branch] ubuntu/raring-devel -> source-packaging/ubuntu/raring-devel * [new branch] ubuntu/raring-proposed -> source-packaging/ubuntu/raring-proposed * [new branch] ubuntu/raring-security -> source-packaging/ubuntu/raring-security * [new branch] ubuntu/raring-updates -> source-packaging/ubuntu/raring-updates * [new branch] ubuntu/saucy -> source-packaging/ubuntu/saucy * [new branch] ubuntu/saucy-devel -> source-packaging/ubuntu/saucy-devel * [new branch] ubuntu/saucy-proposed -> source-packaging/ubuntu/saucy-proposed * [new branch] ubuntu/saucy-updates -> source-packaging/ubuntu/saucy-updates * [new branch] ubuntu/trusty -> source-packaging/ubuntu/trusty * [new branch] ubuntu/trusty-devel -> source-packaging/ubuntu/trusty-devel * [new branch] ubuntu/trusty-proposed -> source-packaging/ubuntu/trusty-proposed * [new branch] ubuntu/trusty-security -> source-packaging/ubuntu/trusty-security * [new branch] ubuntu/trusty-updates -> source-packaging/ubuntu/trusty-updates * [new branch] ubuntu/utopic -> source-packaging/ubuntu/utopic * [new branch] ubuntu/utopic-devel -> source-packaging/ubuntu/utopic-devel * [new branch] ubuntu/utopic-proposed -> source-packaging/ubuntu/utopic-proposed * [new branch] ubuntu/utopic-updates -> source-packaging/ubuntu/utopic-updates * [new branch] ubuntu/vivid -> source-packaging/ubuntu/vivid * [new branch] ubuntu/vivid-devel -> source-packaging/ubuntu/vivid-devel * [new branch] ubuntu/vivid-proposed -> source-packaging/ubuntu/vivid-proposed * [new branch] ubuntu/vivid-updates -> source-packaging/ubuntu/vivid-updates * [new branch] ubuntu/wily -> source-packaging/ubuntu/wily * [new branch] ubuntu/wily-devel -> source-packaging/ubuntu/wily-devel * [new branch] ubuntu/wily-proposed -> source-packaging/ubuntu/wily-proposed * [new branch] ubuntu/wily-updates -> source-packaging/ubuntu/wily-updates * [new branch] ubuntu/xenial -> source-packaging/ubuntu/xenial * [new branch] ubuntu/xenial-devel -> source-packaging/ubuntu/xenial-devel * [new branch] ubuntu/xenial-proposed -> source-packaging/ubuntu/xenial-proposed * [new branch] ubuntu/xenial-security -> source-packaging/ubuntu/xenial-security * [new branch] ubuntu/xenial-updates -> source-packaging/ubuntu/xenial-updates * [new branch] ubuntu/yakkety -> source-packaging/ubuntu/yakkety * [new branch] ubuntu/yakkety-devel -> source-packaging/ubuntu/yakkety-devel * [new branch] ubuntu/yakkety-proposed -> source-packaging/ubuntu/yakkety-proposed * [new branch] ubuntu/yakkety-security -> source-packaging/ubuntu/yakkety-security * [new branch] ubuntu/yakkety-updates -> source-packaging/ubuntu/yakkety-updates * [new branch] ubuntu/zesty -> source-packaging/ubuntu/zesty * [new branch] ubuntu/zesty-devel -> source-packaging/ubuntu/zesty-devel * [new branch] ubuntu/zesty-proposed -> source-packaging/ubuntu/zesty-proposed * [new branch] ubuntu/zesty-security -> source-packaging/ubuntu/zesty-security * [new branch] ubuntu/zesty-updates -> source-packaging/ubuntu/zesty-updates * [new tag] applied/198-0ubuntu11 -> applied/198-0ubuntu11 * [new tag] applied/198-0ubuntu11.1 -> applied/198-0ubuntu11.1 * [new tag] applied/198-0ubuntu11.2 -> applied/198-0ubuntu11.2 * [new tag] applied/204-0ubuntu18 -> applied/204-0ubuntu18 * [new tag] applied/204-0ubuntu19.2 -> applied/204-0ubuntu19.2 * [new tag] applied/204-5ubuntu20 -> applied/204-5ubuntu20 * [new tag] applied/204-5ubuntu20.29 -> applied/204-5ubuntu20.29 * [new tag] applied/204-5ubuntu20.31 -> applied/204-5ubuntu20.31 * [new tag] applied/208-8ubuntu8 -> applied/208-8ubuntu8 * [new tag] applied/208-8ubuntu8.2 -> applied/208-8ubuntu8.2 * [new tag] applied/215-17+deb8u7 -> applied/215-17+deb8u7 * [new tag] applied/219-7ubuntu3 -> applied/219-7ubuntu3 * [new tag] applied/219-7ubuntu6 -> applied/219-7ubuntu6 * [new tag] applied/225-1ubuntu9 -> applied/225-1ubuntu9 * [new tag] applied/225-1ubuntu9.1 -> applied/225-1ubuntu9.1 * [new tag] applied/229-4ubuntu21.27 -> applied/229-4ubuntu21.27 * [new tag] applied/229-4ubuntu21.29 -> applied/229-4ubuntu21.29 * [new tag] applied/229-4ubuntu21.31 -> applied/229-4ubuntu21.31 * [new tag] applied/229-4ubuntu4 -> applied/229-4ubuntu4 * [new tag] applied/231-9git1 -> applied/231-9git1 * [new tag] applied/231-9ubuntu4 -> applied/231-9ubuntu4 * [new tag] applied/231-9ubuntu5 -> applied/231-9ubuntu5 * [new tag] applied/232-21ubuntu2 -> applied/232-21ubuntu2 * [new tag] applied/232-21ubuntu7 -> applied/232-21ubuntu7 * [new tag] applied/232-21ubuntu7.1 -> applied/232-21ubuntu7.1 * [new tag] applied/232-25+deb9u12 -> applied/232-25+deb9u12 * [new tag] applied/234-2ubuntu12 -> applied/234-2ubuntu12 * [new tag] applied/234-2ubuntu12.1 -> applied/234-2ubuntu12.1 * [new tag] applied/234-2ubuntu12.4 -> applied/234-2ubuntu12.4 * [new tag] applied/237-3ubuntu10 -> applied/237-3ubuntu10 * [new tag] applied/237-3ubuntu10.38 -> applied/237-3ubuntu10.38 * [new tag] applied/237-3ubuntu10.45 -> applied/237-3ubuntu10.45 * [new tag] applied/237-3ubuntu10.46 -> applied/237-3ubuntu10.46 * [new tag] applied/239-7ubuntu10 -> applied/239-7ubuntu10 * [new tag] applied/239-7ubuntu10.12 -> applied/239-7ubuntu10.12 * [new tag] applied/239-7ubuntu10.14 -> applied/239-7ubuntu10.14 * [new tag] applied/240-6ubuntu5 -> applied/240-6ubuntu5 * [new tag] applied/240-6ubuntu5.7 -> applied/240-6ubuntu5.7 * [new tag] applied/240-6ubuntu5.8 -> applied/240-6ubuntu5.8 * [new tag] applied/241-7_deb10u7 -> applied/241-7_deb10u7 * [new tag] applied/242-7ubuntu3 -> applied/242-7ubuntu3 * [new tag] applied/242-7ubuntu3.11 -> applied/242-7ubuntu3.11 * [new tag] applied/245.4-4ubuntu3 -> applied/245.4-4ubuntu3 * [new tag] applied/245.4-4ubuntu3.6 -> applied/245.4-4ubuntu3.6 * [new tag] applied/246.6-1ubuntu1 -> applied/246.6-1ubuntu1 * [new tag] applied/246.6-1ubuntu1.3 -> applied/246.6-1ubuntu1.3 * [new tag] applied/247.1-1 -> applied/247.1-1 * [new tag] applied/247.3-3ubuntu2 -> applied/247.3-3ubuntu2 * [new tag] applied/247.3-3ubuntu3 -> applied/247.3-3ubuntu3 * [new tag] applied/44-11+deb7u4 -> applied/44-11+deb7u4 * [new tag] import/198-0ubuntu11 -> import/198-0ubuntu11 * [new tag] import/198-0ubuntu11.1 -> import/198-0ubuntu11.1 * [new tag] import/198-0ubuntu11.2 -> import/198-0ubuntu11.2 * [new tag] import/204-0ubuntu18 -> import/204-0ubuntu18 * [new tag] import/204-0ubuntu19.2 -> import/204-0ubuntu19.2 * [new tag] import/204-5ubuntu20 -> import/204-5ubuntu20 * [new tag] import/204-5ubuntu20.29 -> import/204-5ubuntu20.29 * [new tag] import/204-5ubuntu20.31 -> import/204-5ubuntu20.31 * [new tag] import/208-8ubuntu8 -> import/208-8ubuntu8 * [new tag] import/208-8ubuntu8.2 -> import/208-8ubuntu8.2 * [new tag] import/215-17+deb8u7 -> import/215-17+deb8u7 * [new tag] import/219-7ubuntu3 -> import/219-7ubuntu3 * [new tag] import/219-7ubuntu6 -> import/219-7ubuntu6 * [new tag] import/225-1ubuntu9 -> import/225-1ubuntu9 * [new tag] import/225-1ubuntu9.1 -> import/225-1ubuntu9.1 * [new tag] import/229-4ubuntu21.27 -> import/229-4ubuntu21.27 * [new tag] import/229-4ubuntu21.29 -> import/229-4ubuntu21.29 * [new tag] import/229-4ubuntu21.31 -> import/229-4ubuntu21.31 * [new tag] import/229-4ubuntu4 -> import/229-4ubuntu4 * [new tag] import/231-9git1 -> import/231-9git1 * [new tag] import/231-9ubuntu4 -> import/231-9ubuntu4 * [new tag] import/231-9ubuntu5 -> import/231-9ubuntu5 * [new tag] import/232-21ubuntu2 -> import/232-21ubuntu2 * [new tag] import/232-21ubuntu7 -> import/232-21ubuntu7 * [new tag] import/232-21ubuntu7.1 -> import/232-21ubuntu7.1 * [new tag] import/232-25+deb9u12 -> import/232-25+deb9u12 * [new tag] import/234-2ubuntu12 -> import/234-2ubuntu12 * [new tag] import/234-2ubuntu12.1 -> import/234-2ubuntu12.1 * [new tag] import/234-2ubuntu12.4 -> import/234-2ubuntu12.4 * [new tag] import/237-3ubuntu10 -> import/237-3ubuntu10 * [new tag] import/237-3ubuntu10.38 -> import/237-3ubuntu10.38 * [new tag] import/237-3ubuntu10.45 -> import/237-3ubuntu10.45 * [new tag] import/237-3ubuntu10.46 -> import/237-3ubuntu10.46 * [new tag] import/239-7ubuntu10 -> import/239-7ubuntu10 * [new tag] import/239-7ubuntu10.12 -> import/239-7ubuntu10.12 * [new tag] import/239-7ubuntu10.14 -> import/239-7ubuntu10.14 * [new tag] import/240-6ubuntu5 -> import/240-6ubuntu5 * [new tag] import/240-6ubuntu5.7 -> import/240-6ubuntu5.7 * [new tag] import/240-6ubuntu5.8 -> import/240-6ubuntu5.8 * [new tag] import/241-7_deb10u7 -> import/241-7_deb10u7 * [new tag] import/242-7ubuntu3 -> import/242-7ubuntu3 * [new tag] import/242-7ubuntu3.11 -> import/242-7ubuntu3.11 * [new tag] import/245.4-4ubuntu3 -> import/245.4-4ubuntu3 * [new tag] import/245.4-4ubuntu3.6 -> import/245.4-4ubuntu3.6 * [new tag] import/246.6-1ubuntu1 -> import/246.6-1ubuntu1 * [new tag] import/246.6-1ubuntu1.3 -> import/246.6-1ubuntu1.3 * [new tag] import/44-11+deb7u4 -> import/44-11+deb7u4 * [new tag] applied/0_git+20100605+dfd8ee-1 -> applied/0_git+20100605+dfd8ee-1 * [new tag] applied/11-1 -> applied/11-1 * [new tag] applied/16-1 -> applied/16-1 * [new tag] applied/17-1 -> applied/17-1 * [new tag] applied/19-1 -> applied/19-1 * [new tag] applied/198-0ubuntu1 -> applied/198-0ubuntu1 * [new tag] applied/198-0ubuntu10 -> applied/198-0ubuntu10 * [new tag] applied/198-0ubuntu12 -> applied/198-0ubuntu12 * [new tag] applied/198-0ubuntu2 -> applied/198-0ubuntu2 * [new tag] applied/198-0ubuntu3 -> applied/198-0ubuntu3 * [new tag] applied/198-0ubuntu4 -> applied/198-0ubuntu4 * [new tag] applied/198-0ubuntu5 -> applied/198-0ubuntu5 * [new tag] applied/198-0ubuntu6 -> applied/198-0ubuntu6 * [new tag] applied/198-0ubuntu7 -> applied/198-0ubuntu7 * [new tag] applied/198-0ubuntu8 -> applied/198-0ubuntu8 * [new tag] applied/198-0ubuntu9 -> applied/198-0ubuntu9 * [new tag] applied/20-1 -> applied/20-1 * [new tag] applied/202-0ubuntu1 -> applied/202-0ubuntu1 * [new tag] applied/202-0ubuntu10 -> applied/202-0ubuntu10 * [new tag] applied/202-0ubuntu11 -> applied/202-0ubuntu11 * [new tag] applied/202-0ubuntu12 -> applied/202-0ubuntu12 * [new tag] applied/202-0ubuntu2 -> applied/202-0ubuntu2 * [new tag] applied/202-0ubuntu3 -> applied/202-0ubuntu3 * [new tag] applied/202-0ubuntu4 -> applied/202-0ubuntu4 * [new tag] applied/202-0ubuntu5 -> applied/202-0ubuntu5 * [new tag] applied/202-0ubuntu6 -> applied/202-0ubuntu6 * [new tag] applied/202-0ubuntu7 -> applied/202-0ubuntu7 * [new tag] applied/202-0ubuntu8 -> applied/202-0ubuntu8 * [new tag] applied/202-0ubuntu9 -> applied/202-0ubuntu9 * [new tag] applied/204-0ubuntu1 -> applied/204-0ubuntu1 * [new tag] applied/204-0ubuntu10 -> applied/204-0ubuntu10 * [new tag] applied/204-0ubuntu11 -> applied/204-0ubuntu11 * [new tag] applied/204-0ubuntu12 -> applied/204-0ubuntu12 * [new tag] applied/204-0ubuntu13 -> applied/204-0ubuntu13 * [new tag] applied/204-0ubuntu14 -> applied/204-0ubuntu14 * [new tag] applied/204-0ubuntu15 -> applied/204-0ubuntu15 * [new tag] applied/204-0ubuntu16 -> applied/204-0ubuntu16 * [new tag] applied/204-0ubuntu17 -> applied/204-0ubuntu17 * [new tag] applied/204-0ubuntu19 -> applied/204-0ubuntu19 * [new tag] applied/204-0ubuntu19.1 -> applied/204-0ubuntu19.1 * [new tag] applied/204-0ubuntu2 -> applied/204-0ubuntu2 * [new tag] applied/204-0ubuntu3 -> applied/204-0ubuntu3 * [new tag] applied/204-0ubuntu4 -> applied/204-0ubuntu4 * [new tag] applied/204-0ubuntu5 -> applied/204-0ubuntu5 * [new tag] applied/204-0ubuntu6 -> applied/204-0ubuntu6 * [new tag] applied/204-0ubuntu7 -> applied/204-0ubuntu7 * [new tag] applied/204-0ubuntu8 -> applied/204-0ubuntu8 * [new tag] applied/204-0ubuntu9 -> applied/204-0ubuntu9 * [new tag] applied/204-1 -> applied/204-1 * [new tag] applied/204-10 -> applied/204-10 * [new tag] applied/204-2 -> applied/204-2 * [new tag] applied/204-3 -> applied/204-3 * [new tag] applied/204-4 -> applied/204-4 * [new tag] applied/204-5 -> applied/204-5 * [new tag] applied/204-5ubuntu1 -> applied/204-5ubuntu1 * [new tag] applied/204-5ubuntu10 -> applied/204-5ubuntu10 * [new tag] applied/204-5ubuntu11 -> applied/204-5ubuntu11 * [new tag] applied/204-5ubuntu12 -> applied/204-5ubuntu12 * [new tag] applied/204-5ubuntu13 -> applied/204-5ubuntu13 * [new tag] applied/204-5ubuntu14 -> applied/204-5ubuntu14 * [new tag] applied/204-5ubuntu15 -> applied/204-5ubuntu15 * [new tag] applied/204-5ubuntu16 -> applied/204-5ubuntu16 * [new tag] applied/204-5ubuntu17 -> applied/204-5ubuntu17 * [new tag] applied/204-5ubuntu18 -> applied/204-5ubuntu18 * [new tag] applied/204-5ubuntu19 -> applied/204-5ubuntu19 * [new tag] applied/204-5ubuntu2 -> applied/204-5ubuntu2 * [new tag] applied/204-5ubuntu20.1 -> applied/204-5ubuntu20.1 * [new tag] applied/204-5ubuntu20.10 -> applied/204-5ubuntu20.10 * [new tag] applied/204-5ubuntu20.11 -> applied/204-5ubuntu20.11 * [new tag] applied/204-5ubuntu20.12 -> applied/204-5ubuntu20.12 * [new tag] applied/204-5ubuntu20.13 -> applied/204-5ubuntu20.13 * [new tag] applied/204-5ubuntu20.14 -> applied/204-5ubuntu20.14 * [new tag] applied/204-5ubuntu20.15 -> applied/204-5ubuntu20.15 * [new tag] applied/204-5ubuntu20.18 -> applied/204-5ubuntu20.18 * [new tag] applied/204-5ubuntu20.19 -> applied/204-5ubuntu20.19 * [new tag] applied/204-5ubuntu20.2 -> applied/204-5ubuntu20.2 * [new tag] applied/204-5ubuntu20.20 -> applied/204-5ubuntu20.20 * [new tag] applied/204-5ubuntu20.21 -> applied/204-5ubuntu20.21 * [new tag] applied/204-5ubuntu20.22 -> applied/204-5ubuntu20.22 * [new tag] applied/204-5ubuntu20.24 -> applied/204-5ubuntu20.24 * [new tag] applied/204-5ubuntu20.25 -> applied/204-5ubuntu20.25 * [new tag] applied/204-5ubuntu20.26 -> applied/204-5ubuntu20.26 * [new tag] applied/204-5ubuntu20.28 -> applied/204-5ubuntu20.28 * [new tag] applied/204-5ubuntu20.3 -> applied/204-5ubuntu20.3 * [new tag] applied/204-5ubuntu20.4 -> applied/204-5ubuntu20.4 * [new tag] applied/204-5ubuntu20.5 -> applied/204-5ubuntu20.5 * [new tag] applied/204-5ubuntu20.6 -> applied/204-5ubuntu20.6 * [new tag] applied/204-5ubuntu20.7 -> applied/204-5ubuntu20.7 * [new tag] applied/204-5ubuntu20.8 -> applied/204-5ubuntu20.8 * [new tag] applied/204-5ubuntu20.9 -> applied/204-5ubuntu20.9 * [new tag] applied/204-5ubuntu3 -> applied/204-5ubuntu3 * [new tag] applied/204-5ubuntu4 -> applied/204-5ubuntu4 * [new tag] applied/204-5ubuntu5 -> applied/204-5ubuntu5 * [new tag] applied/204-5ubuntu6 -> applied/204-5ubuntu6 * [new tag] applied/204-5ubuntu7 -> applied/204-5ubuntu7 * [new tag] applied/204-5ubuntu8 -> applied/204-5ubuntu8 * [new tag] applied/204-5ubuntu9 -> applied/204-5ubuntu9 * [new tag] applied/204-6 -> applied/204-6 * [new tag] applied/204-7 -> applied/204-7 * [new tag] applied/204-8 -> applied/204-8 * [new tag] applied/204-9 -> applied/204-9 * [new tag] applied/208-1 -> applied/208-1 * [new tag] applied/208-2 -> applied/208-2 * [new tag] applied/208-3 -> applied/208-3 * [new tag] applied/208-4 -> applied/208-4 * [new tag] applied/208-5 -> applied/208-5 * [new tag] applied/208-6 -> applied/208-6 * [new tag] applied/208-7 -> applied/208-7 * [new tag] applied/208-8 -> applied/208-8 * [new tag] applied/208-8ubuntu1 -> applied/208-8ubuntu1 * [new tag] applied/208-8ubuntu2 -> applied/208-8ubuntu2 * [new tag] applied/208-8ubuntu3 -> applied/208-8ubuntu3 * [new tag] applied/208-8ubuntu4 -> applied/208-8ubuntu4 * [new tag] applied/208-8ubuntu5 -> applied/208-8ubuntu5 * [new tag] applied/208-8ubuntu6 -> applied/208-8ubuntu6 * [new tag] applied/208-8ubuntu7 -> applied/208-8ubuntu7 * [new tag] applied/208-8ubuntu8.1 -> applied/208-8ubuntu8.1 * [new tag] applied/214-1 -> applied/214-1 * [new tag] applied/215-1 -> applied/215-1 * [new tag] applied/215-10 -> applied/215-10 * [new tag] applied/215-11 -> applied/215-11 * [new tag] applied/215-12 -> applied/215-12 * [new tag] applied/215-13 -> applied/215-13 * [new tag] applied/215-14 -> applied/215-14 * [new tag] applied/215-15 -> applied/215-15 * [new tag] applied/215-16 -> applied/215-16 * [new tag] applied/215-17 -> applied/215-17 * [new tag] applied/215-17+deb8u1 -> applied/215-17+deb8u1 * [new tag] applied/215-17+deb8u2 -> applied/215-17+deb8u2 * [new tag] applied/215-17+deb8u3 -> applied/215-17+deb8u3 * [new tag] applied/215-17+deb8u4 -> applied/215-17+deb8u4 * [new tag] applied/215-17+deb8u5 -> applied/215-17+deb8u5 * [new tag] applied/215-17+deb8u6 -> applied/215-17+deb8u6 * [new tag] applied/215-2 -> applied/215-2 * [new tag] applied/215-3 -> applied/215-3 * [new tag] applied/215-4 -> applied/215-4 * [new tag] applied/215-5 -> applied/215-5 * [new tag] applied/215-6 -> applied/215-6 * [new tag] applied/215-7 -> applied/215-7 * [new tag] applied/215-8 -> applied/215-8 * [new tag] applied/215-9 -> applied/215-9 * [new tag] applied/217-1 -> applied/217-1 * [new tag] applied/217-2 -> applied/217-2 * [new tag] applied/217-3 -> applied/217-3 * [new tag] applied/217-4 -> applied/217-4 * [new tag] applied/218-1 -> applied/218-1 * [new tag] applied/218-10 -> applied/218-10 * [new tag] applied/218-2 -> applied/218-2 * [new tag] applied/218-3 -> applied/218-3 * [new tag] applied/218-4 -> applied/218-4 * [new tag] applied/218-5 -> applied/218-5 * [new tag] applied/218-6 -> applied/218-6 * [new tag] applied/218-7 -> applied/218-7 * [new tag] applied/218-8 -> applied/218-8 * [new tag] applied/218-9 -> applied/218-9 * [new tag] applied/219-1 -> applied/219-1 * [new tag] applied/219-10 -> applied/219-10 * [new tag] applied/219-2 -> applied/219-2 * [new tag] applied/219-3 -> applied/219-3 * [new tag] applied/219-4 -> applied/219-4 * [new tag] applied/219-5 -> applied/219-5 * [new tag] applied/219-6 -> applied/219-6 * [new tag] applied/219-7 -> applied/219-7 * [new tag] applied/219-7ubuntu1 -> applied/219-7ubuntu1 * [new tag] applied/219-7ubuntu2 -> applied/219-7ubuntu2 * [new tag] applied/219-7ubuntu4 -> applied/219-7ubuntu4 * [new tag] applied/219-7ubuntu5 -> applied/219-7ubuntu5 * [new tag] applied/219-8 -> applied/219-8 * [new tag] applied/219-9 -> applied/219-9 * [new tag] applied/220-1 -> applied/220-1 * [new tag] applied/220-2 -> applied/220-2 * [new tag] applied/220-3 -> applied/220-3 * [new tag] applied/220-4 -> applied/220-4 * [new tag] applied/220-5 -> applied/220-5 * [new tag] applied/220-6 -> applied/220-6 * [new tag] applied/220-7 -> applied/220-7 * [new tag] applied/221-1 -> applied/221-1 * [new tag] applied/222-1 -> applied/222-1 * [new tag] applied/222-2 -> applied/222-2 * [new tag] applied/223-1 -> applied/223-1 * [new tag] applied/223-2 -> applied/223-2 * [new tag] applied/224-1 -> applied/224-1 * [new tag] applied/224-2 -> applied/224-2 * [new tag] applied/225-1 -> applied/225-1 * [new tag] applied/225-1ubuntu1 -> applied/225-1ubuntu1 * [new tag] applied/225-1ubuntu2 -> applied/225-1ubuntu2 * [new tag] applied/225-1ubuntu3 -> applied/225-1ubuntu3 * [new tag] applied/225-1ubuntu4 -> applied/225-1ubuntu4 * [new tag] applied/225-1ubuntu5 -> applied/225-1ubuntu5 * [new tag] applied/225-1ubuntu6 -> applied/225-1ubuntu6 * [new tag] applied/225-1ubuntu7 -> applied/225-1ubuntu7 * [new tag] applied/225-1ubuntu8 -> applied/225-1ubuntu8 * [new tag] applied/226-1 -> applied/226-1 * [new tag] applied/226-2 -> applied/226-2 * [new tag] applied/226-3 -> applied/226-3 * [new tag] applied/226-4 -> applied/226-4 * [new tag] applied/227-1 -> applied/227-1 * [new tag] applied/227-2 -> applied/227-2 * [new tag] applied/227-3 -> applied/227-3 * [new tag] applied/228-1 -> applied/228-1 * [new tag] applied/228-2 -> applied/228-2 * [new tag] applied/228-3 -> applied/228-3 * [new tag] applied/228-4 -> applied/228-4 * [new tag] applied/228-5 -> applied/228-5 * [new tag] applied/228-6 -> applied/228-6 * [new tag] applied/229-1 -> applied/229-1 * [new tag] applied/229-2 -> applied/229-2 * [new tag] applied/229-3 -> applied/229-3 * [new tag] applied/229-4 -> applied/229-4 * [new tag] applied/229-4ubuntu1 -> applied/229-4ubuntu1 * [new tag] applied/229-4ubuntu10 -> applied/229-4ubuntu10 * [new tag] applied/229-4ubuntu11 -> applied/229-4ubuntu11 * [new tag] applied/229-4ubuntu12 -> applied/229-4ubuntu12 * [new tag] applied/229-4ubuntu13 -> applied/229-4ubuntu13 * [new tag] applied/229-4ubuntu16 -> applied/229-4ubuntu16 * [new tag] applied/229-4ubuntu17 -> applied/229-4ubuntu17 * [new tag] applied/229-4ubuntu18 -> applied/229-4ubuntu18 * [new tag] applied/229-4ubuntu19 -> applied/229-4ubuntu19 * [new tag] applied/229-4ubuntu2 -> applied/229-4ubuntu2 * [new tag] applied/229-4ubuntu20 -> applied/229-4ubuntu20 * [new tag] applied/229-4ubuntu21 -> applied/229-4ubuntu21 * [new tag] applied/229-4ubuntu21.1 -> applied/229-4ubuntu21.1 * [new tag] applied/229-4ubuntu21.10 -> applied/229-4ubuntu21.10 * [new tag] applied/229-4ubuntu21.15 -> applied/229-4ubuntu21.15 * [new tag] applied/229-4ubuntu21.16 -> applied/229-4ubuntu21.16 * [new tag] applied/229-4ubuntu21.17 -> applied/229-4ubuntu21.17 * [new tag] applied/229-4ubuntu21.18 -> applied/229-4ubuntu21.18 * [new tag] applied/229-4ubuntu21.19 -> applied/229-4ubuntu21.19 * [new tag] applied/229-4ubuntu21.2 -> applied/229-4ubuntu21.2 * [new tag] applied/229-4ubuntu21.21 -> applied/229-4ubuntu21.21 * [new tag] applied/229-4ubuntu21.22 -> applied/229-4ubuntu21.22 * [new tag] applied/229-4ubuntu21.23 -> applied/229-4ubuntu21.23 * [new tag] applied/229-4ubuntu21.28 -> applied/229-4ubuntu21.28 * [new tag] applied/229-4ubuntu21.3 -> applied/229-4ubuntu21.3 * [new tag] applied/229-4ubuntu21.30 -> applied/229-4ubuntu21.30 * [new tag] applied/229-4ubuntu21.4 -> applied/229-4ubuntu21.4 * [new tag] applied/229-4ubuntu21.5 -> applied/229-4ubuntu21.5 * [new tag] applied/229-4ubuntu21.6 -> applied/229-4ubuntu21.6 * [new tag] applied/229-4ubuntu21.8 -> applied/229-4ubuntu21.8 * [new tag] applied/229-4ubuntu21.9 -> applied/229-4ubuntu21.9 * [new tag] applied/229-4ubuntu3 -> applied/229-4ubuntu3 * [new tag] applied/229-4ubuntu5 -> applied/229-4ubuntu5 * [new tag] applied/229-4ubuntu6 -> applied/229-4ubuntu6 * [new tag] applied/229-4ubuntu7 -> applied/229-4ubuntu7 * [new tag] applied/229-4ubuntu8 -> applied/229-4ubuntu8 * [new tag] applied/229-5 -> applied/229-5 * [new tag] applied/229-6 -> applied/229-6 * [new tag] applied/230-1 -> applied/230-1 * [new tag] applied/230-2 -> applied/230-2 * [new tag] applied/230-3 -> applied/230-3 * [new tag] applied/230-4 -> applied/230-4 * [new tag] applied/230-5 -> applied/230-5 * [new tag] applied/230-6 -> applied/230-6 * [new tag] applied/230-7 -> applied/230-7 * [new tag] applied/231-1 -> applied/231-1 * [new tag] applied/231-10 -> applied/231-10 * [new tag] applied/231-2 -> applied/231-2 * [new tag] applied/231-3 -> applied/231-3 * [new tag] applied/231-4 -> applied/231-4 * [new tag] applied/231-5 -> applied/231-5 * [new tag] applied/231-6 -> applied/231-6 * [new tag] applied/231-7 -> applied/231-7 * [new tag] applied/231-8 -> applied/231-8 * [new tag] applied/231-9 -> applied/231-9 * [new tag] applied/231-9ubuntu1 -> applied/231-9ubuntu1 * [new tag] applied/231-9ubuntu2 -> applied/231-9ubuntu2 * [new tag] applied/231-9ubuntu3 -> applied/231-9ubuntu3 * [new tag] applied/232-1 -> applied/232-1 * [new tag] applied/232-10 -> applied/232-10 * [new tag] applied/232-11 -> applied/232-11 * [new tag] applied/232-12 -> applied/232-12 * [new tag] applied/232-13 -> applied/232-13 * [new tag] applied/232-14 -> applied/232-14 * [new tag] applied/232-15 -> applied/232-15 * [new tag] applied/232-16 -> applied/232-16 * [new tag] applied/232-17 -> applied/232-17 * [new tag] applied/232-18 -> applied/232-18 * [new tag] applied/232-19 -> applied/232-19 * [new tag] applied/232-2 -> applied/232-2 * [new tag] applied/232-20 -> applied/232-20 * [new tag] applied/232-21 -> applied/232-21 * [new tag] applied/232-21ubuntu1 -> applied/232-21ubuntu1 * [new tag] applied/232-21ubuntu3 -> applied/232-21ubuntu3 * [new tag] applied/232-21ubuntu4 -> applied/232-21ubuntu4 * [new tag] applied/232-21ubuntu5 -> applied/232-21ubuntu5 * [new tag] applied/232-21ubuntu6 -> applied/232-21ubuntu6 * [new tag] applied/232-22 -> applied/232-22 * [new tag] applied/232-23 -> applied/232-23 * [new tag] applied/232-24 -> applied/232-24 * [new tag] applied/232-25 -> applied/232-25 * [new tag] applied/232-25+deb9u1 -> applied/232-25+deb9u1 * [new tag] applied/232-25+deb9u11 -> applied/232-25+deb9u11 * [new tag] applied/232-25+deb9u2 -> applied/232-25+deb9u2 * [new tag] applied/232-25+deb9u4 -> applied/232-25+deb9u4 * [new tag] applied/232-25+deb9u6 -> applied/232-25+deb9u6 * [new tag] applied/232-25+deb9u8 -> applied/232-25+deb9u8 * [new tag] applied/232-3 -> applied/232-3 * [new tag] applied/232-4 -> applied/232-4 * [new tag] applied/232-5 -> applied/232-5 * [new tag] applied/232-6 -> applied/232-6 * [new tag] applied/232-7 -> applied/232-7 * [new tag] applied/232-8 -> applied/232-8 * [new tag] applied/232-9 -> applied/232-9 * [new tag] applied/233-1 -> applied/233-1 * [new tag] applied/233-10 -> applied/233-10 * [new tag] applied/233-2 -> applied/233-2 * [new tag] applied/233-3 -> applied/233-3 * [new tag] applied/233-4 -> applied/233-4 * [new tag] applied/233-5 -> applied/233-5 * [new tag] applied/233-6 -> applied/233-6 * [new tag] applied/233-7 -> applied/233-7 * [new tag] applied/233-8 -> applied/233-8 * [new tag] applied/233-9 -> applied/233-9 * [new tag] applied/234-1 -> applied/234-1 * [new tag] applied/234-2 -> applied/234-2 * [new tag] applied/234-2.1 -> applied/234-2.1 * [new tag] applied/234-2.3 -> applied/234-2.3 * [new tag] applied/234-2ubuntu1 -> applied/234-2ubuntu1 * [new tag] applied/234-2ubuntu10 -> applied/234-2ubuntu10 * [new tag] applied/234-2ubuntu11 -> applied/234-2ubuntu11 * [new tag] applied/234-2ubuntu12.3 -> applied/234-2ubuntu12.3 * [new tag] applied/234-2ubuntu2 -> applied/234-2ubuntu2 * [new tag] applied/234-2ubuntu3 -> applied/234-2ubuntu3 * [new tag] applied/234-2ubuntu4 -> applied/234-2ubuntu4 * [new tag] applied/234-2ubuntu5 -> applied/234-2ubuntu5 * [new tag] applied/234-2ubuntu6 -> applied/234-2ubuntu6 * [new tag] applied/234-2ubuntu7 -> applied/234-2ubuntu7 * [new tag] applied/234-2ubuntu8 -> applied/234-2ubuntu8 * [new tag] applied/234-2ubuntu9 -> applied/234-2ubuntu9 * [new tag] applied/234-3 -> applied/234-3 * [new tag] applied/235-1 -> applied/235-1 * [new tag] applied/235-2 -> applied/235-2 * [new tag] applied/235-3 -> applied/235-3 * [new tag] applied/236-1 -> applied/236-1 * [new tag] applied/236-2 -> applied/236-2 * [new tag] applied/236-3 -> applied/236-3 * [new tag] applied/236-4 -> applied/236-4 * [new tag] applied/237-1 -> applied/237-1 * [new tag] applied/237-2 -> applied/237-2 * [new tag] applied/237-3 -> applied/237-3 * [new tag] applied/237-3ubuntu1 -> applied/237-3ubuntu1 * [new tag] applied/237-3ubuntu10.1 -> applied/237-3ubuntu10.1 * [new tag] applied/237-3ubuntu10.11 -> applied/237-3ubuntu10.11 * [new tag] applied/237-3ubuntu10.12 -> applied/237-3ubuntu10.12 * [new tag] applied/237-3ubuntu10.13 -> applied/237-3ubuntu10.13 * [new tag] applied/237-3ubuntu10.15 -> applied/237-3ubuntu10.15 * [new tag] applied/237-3ubuntu10.16 -> applied/237-3ubuntu10.16 * [new tag] applied/237-3ubuntu10.17 -> applied/237-3ubuntu10.17 * [new tag] applied/237-3ubuntu10.19 -> applied/237-3ubuntu10.19 * [new tag] applied/237-3ubuntu10.2 -> applied/237-3ubuntu10.2 * [new tag] applied/237-3ubuntu10.20 -> applied/237-3ubuntu10.20 * [new tag] applied/237-3ubuntu10.21 -> applied/237-3ubuntu10.21 * [new tag] applied/237-3ubuntu10.22 -> applied/237-3ubuntu10.22 * [new tag] applied/237-3ubuntu10.23 -> applied/237-3ubuntu10.23 * [new tag] applied/237-3ubuntu10.24 -> applied/237-3ubuntu10.24 * [new tag] applied/237-3ubuntu10.25 -> applied/237-3ubuntu10.25 * [new tag] applied/237-3ubuntu10.26 -> applied/237-3ubuntu10.26 * [new tag] applied/237-3ubuntu10.28 -> applied/237-3ubuntu10.28 * [new tag] applied/237-3ubuntu10.29 -> applied/237-3ubuntu10.29 * [new tag] applied/237-3ubuntu10.3 -> applied/237-3ubuntu10.3 * [new tag] applied/237-3ubuntu10.31 -> applied/237-3ubuntu10.31 * [new tag] applied/237-3ubuntu10.32 -> applied/237-3ubuntu10.32 * [new tag] applied/237-3ubuntu10.33 -> applied/237-3ubuntu10.33 * [new tag] applied/237-3ubuntu10.39 -> applied/237-3ubuntu10.39 * [new tag] applied/237-3ubuntu10.4 -> applied/237-3ubuntu10.4 * [new tag] applied/237-3ubuntu10.40 -> applied/237-3ubuntu10.40 * [new tag] applied/237-3ubuntu10.41 -> applied/237-3ubuntu10.41 * [new tag] applied/237-3ubuntu10.42 -> applied/237-3ubuntu10.42 * [new tag] applied/237-3ubuntu10.43 -> applied/237-3ubuntu10.43 * [new tag] applied/237-3ubuntu10.44 -> applied/237-3ubuntu10.44 * [new tag] applied/237-3ubuntu10.6 -> applied/237-3ubuntu10.6 * [new tag] applied/237-3ubuntu10.9 -> applied/237-3ubuntu10.9 * [new tag] applied/237-3ubuntu2 -> applied/237-3ubuntu2 * [new tag] applied/237-3ubuntu3 -> applied/237-3ubuntu3 * [new tag] applied/237-3ubuntu4 -> applied/237-3ubuntu4 * [new tag] applied/237-3ubuntu5 -> applied/237-3ubuntu5 * [new tag] applied/237-3ubuntu6 -> applied/237-3ubuntu6 * [new tag] applied/237-3ubuntu7 -> applied/237-3ubuntu7 * [new tag] applied/237-3ubuntu8 -> applied/237-3ubuntu8 * [new tag] applied/237-3ubuntu9 -> applied/237-3ubuntu9 * [new tag] applied/237-4 -> applied/237-4 * [new tag] applied/238-1 -> applied/238-1 * [new tag] applied/238-2 -> applied/238-2 * [new tag] applied/238-3 -> applied/238-3 * [new tag] applied/238-4 -> applied/238-4 * [new tag] applied/238-5 -> applied/238-5 * [new tag] applied/239-1 -> applied/239-1 * [new tag] applied/239-10 -> applied/239-10 * [new tag] applied/239-11 -> applied/239-11 * [new tag] applied/239-12 -> applied/239-12 * [new tag] applied/239-13 -> applied/239-13 * [new tag] applied/239-14 -> applied/239-14 * [new tag] applied/239-15 -> applied/239-15 * [new tag] applied/239-3 -> applied/239-3 * [new tag] applied/239-4 -> applied/239-4 * [new tag] applied/239-5 -> applied/239-5 * [new tag] applied/239-6 -> applied/239-6 * [new tag] applied/239-7 -> applied/239-7 * [new tag] applied/239-7ubuntu1 -> applied/239-7ubuntu1 * [new tag] applied/239-7ubuntu10.1 -> applied/239-7ubuntu10.1 * [new tag] applied/239-7ubuntu10.10 -> applied/239-7ubuntu10.10 * [new tag] applied/239-7ubuntu10.11 -> applied/239-7ubuntu10.11 * [new tag] applied/239-7ubuntu10.13 -> applied/239-7ubuntu10.13 * [new tag] applied/239-7ubuntu10.3 -> applied/239-7ubuntu10.3 * [new tag] applied/239-7ubuntu10.4 -> applied/239-7ubuntu10.4 * [new tag] applied/239-7ubuntu10.6 -> applied/239-7ubuntu10.6 * [new tag] applied/239-7ubuntu10.7 -> applied/239-7ubuntu10.7 * [new tag] applied/239-7ubuntu10.8 -> applied/239-7ubuntu10.8 * [new tag] applied/239-7ubuntu2 -> applied/239-7ubuntu2 * [new tag] applied/239-7ubuntu3 -> applied/239-7ubuntu3 * [new tag] applied/239-7ubuntu4 -> applied/239-7ubuntu4 * [new tag] applied/239-7ubuntu5 -> applied/239-7ubuntu5 * [new tag] applied/239-7ubuntu6 -> applied/239-7ubuntu6 * [new tag] applied/239-7ubuntu7 -> applied/239-7ubuntu7 * [new tag] applied/239-7ubuntu8 -> applied/239-7ubuntu8 * [new tag] applied/239-7ubuntu9 -> applied/239-7ubuntu9 * [new tag] applied/239-8 -> applied/239-8 * [new tag] applied/239-9 -> applied/239-9 * [new tag] applied/240-1 -> applied/240-1 * [new tag] applied/240-2 -> applied/240-2 * [new tag] applied/240-3 -> applied/240-3 * [new tag] applied/240-4 -> applied/240-4 * [new tag] applied/240-5 -> applied/240-5 * [new tag] applied/240-6 -> applied/240-6 * [new tag] applied/240-6ubuntu1 -> applied/240-6ubuntu1 * [new tag] applied/240-6ubuntu2 -> applied/240-6ubuntu2 * [new tag] applied/240-6ubuntu3 -> applied/240-6ubuntu3 * [new tag] applied/240-6ubuntu4 -> applied/240-6ubuntu4 * [new tag] applied/240-6ubuntu5.1 -> applied/240-6ubuntu5.1 * [new tag] applied/240-6ubuntu5.2 -> applied/240-6ubuntu5.2 * [new tag] applied/240-6ubuntu5.3 -> applied/240-6ubuntu5.3 * [new tag] applied/240-6ubuntu5.4 -> applied/240-6ubuntu5.4 * [new tag] applied/240-6ubuntu5.6 -> applied/240-6ubuntu5.6 * [new tag] applied/241-1 -> applied/241-1 * [new tag] applied/241-2 -> applied/241-2 * [new tag] applied/241-3 -> applied/241-3 * [new tag] applied/241-4 -> applied/241-4 * [new tag] applied/241-5 -> applied/241-5 * [new tag] applied/241-6 -> applied/241-6 * [new tag] applied/241-7 -> applied/241-7 * [new tag] applied/241-7_deb10u1 -> applied/241-7_deb10u1 * [new tag] applied/241-7_deb10u2 -> applied/241-7_deb10u2 * [new tag] applied/241-7_deb10u3 -> applied/241-7_deb10u3 * [new tag] applied/241-7_deb10u4 -> applied/241-7_deb10u4 * [new tag] applied/241-7_deb10u5 -> applied/241-7_deb10u5 * [new tag] applied/241-7_deb10u6 -> applied/241-7_deb10u6 * [new tag] applied/242-1 -> applied/242-1 * [new tag] applied/242-2 -> applied/242-2 * [new tag] applied/242-3 -> applied/242-3 * [new tag] applied/242-4 -> applied/242-4 * [new tag] applied/242-5 -> applied/242-5 * [new tag] applied/242-6 -> applied/242-6 * [new tag] applied/242-7 -> applied/242-7 * [new tag] applied/242-7ubuntu1 -> applied/242-7ubuntu1 * [new tag] applied/242-7ubuntu2 -> applied/242-7ubuntu2 * [new tag] applied/242-7ubuntu3.2 -> applied/242-7ubuntu3.2 * [new tag] applied/242-7ubuntu3.6 -> applied/242-7ubuntu3.6 * [new tag] applied/242-7ubuntu3.7 -> applied/242-7ubuntu3.7 * [new tag] applied/242-7ubuntu3.8 -> applied/242-7ubuntu3.8 * [new tag] applied/242-7ubuntu3.9 -> applied/242-7ubuntu3.9 * [new tag] applied/243-1 -> applied/243-1 * [new tag] applied/243-2 -> applied/243-2 * [new tag] applied/243-3 -> applied/243-3 * [new tag] applied/243-4 -> applied/243-4 * [new tag] applied/243-5 -> applied/243-5 * [new tag] applied/243-6 -> applied/243-6 * [new tag] applied/243-7 -> applied/243-7 * [new tag] applied/243-8 -> applied/243-8 * [new tag] applied/243-9 -> applied/243-9 * [new tag] applied/243_rc2-1 -> applied/243_rc2-1 * [new tag] applied/244-1 -> applied/244-1 * [new tag] applied/244-2 -> applied/244-2 * [new tag] applied/244-3 -> applied/244-3 * [new tag] applied/244.1-1 -> applied/244.1-1 * [new tag] applied/244.1-2 -> applied/244.1-2 * [new tag] applied/244.1-3 -> applied/244.1-3 * [new tag] applied/244.2-1 -> applied/244.2-1 * [new tag] applied/244.3-1 -> applied/244.3-1 * [new tag] applied/245-1 -> applied/245-1 * [new tag] applied/245-2 -> applied/245-2 * [new tag] applied/245.2-1 -> applied/245.2-1 * [new tag] applied/245.4-1 -> applied/245.4-1 * [new tag] applied/245.4-2 -> applied/245.4-2 * [new tag] applied/245.4-3 -> applied/245.4-3 * [new tag] applied/245.4-4 -> applied/245.4-4 * [new tag] applied/245.4-4ubuntu1 -> applied/245.4-4ubuntu1 * [new tag] applied/245.4-4ubuntu3.1 -> applied/245.4-4ubuntu3.1 * [new tag] applied/245.4-4ubuntu3.2 -> applied/245.4-4ubuntu3.2 * [new tag] applied/245.4-4ubuntu3.3 -> applied/245.4-4ubuntu3.3 * [new tag] applied/245.4-4ubuntu3.4 -> applied/245.4-4ubuntu3.4 * [new tag] applied/245.4-4ubuntu3.5 -> applied/245.4-4ubuntu3.5 * [new tag] applied/245.5-1 -> applied/245.5-1 * [new tag] applied/245.5-2 -> applied/245.5-2 * [new tag] applied/245.5-3 -> applied/245.5-3 * [new tag] applied/245.6-1 -> applied/245.6-1 * [new tag] applied/245.6-2 -> applied/245.6-2 * [new tag] applied/245.6-3 -> applied/245.6-3 * [new tag] applied/245.7-1 -> applied/245.7-1 * [new tag] applied/246-1 -> applied/246-1 * [new tag] applied/246-2 -> applied/246-2 * [new tag] applied/246.1-1 -> applied/246.1-1 * [new tag] applied/246.2-1 -> applied/246.2-1 * [new tag] applied/246.2-2 -> applied/246.2-2 * [new tag] applied/246.3-1 -> applied/246.3-1 * [new tag] applied/246.4-1 -> applied/246.4-1 * [new tag] applied/246.5-1 -> applied/246.5-1 * [new tag] applied/246.6-1 -> applied/246.6-1 * [new tag] applied/246.6-1ubuntu1.1 -> applied/246.6-1ubuntu1.1 * [new tag] applied/246.6-1ubuntu1.2 -> applied/246.6-1ubuntu1.2 * [new tag] applied/246.6-2 -> applied/246.6-2 * [new tag] applied/247-1 -> applied/247-1 * [new tag] applied/247.1-2 -> applied/247.1-2 * [new tag] applied/247.1-3 -> applied/247.1-3 * [new tag] applied/247.1-4 -> applied/247.1-4 * [new tag] applied/247.2-1 -> applied/247.2-1 * [new tag] applied/247.2-2 -> applied/247.2-2 * [new tag] applied/247.2-3 -> applied/247.2-3 * [new tag] applied/247.2-4 -> applied/247.2-4 * [new tag] applied/247.2-5 -> applied/247.2-5 * [new tag] applied/247.3-1 -> applied/247.3-1 * [new tag] applied/247.3-2 -> applied/247.3-2 * [new tag] applied/247.3-3 -> applied/247.3-3 * [new tag] applied/247.3-3ubuntu1 -> applied/247.3-3ubuntu1 * [new tag] applied/247_rc2-1 -> applied/247_rc2-1 * [new tag] applied/247_rc2-2 -> applied/247_rc2-2 * [new tag] applied/247_rc2-3 -> applied/247_rc2-3 * [new tag] applied/25-1 -> applied/25-1 * [new tag] applied/25-2 -> applied/25-2 * [new tag] applied/29-1 -> applied/29-1 * [new tag] applied/36-1 -> applied/36-1 * [new tag] applied/37-1 -> applied/37-1 * [new tag] applied/37-1.1 -> applied/37-1.1 * [new tag] applied/43-1 -> applied/43-1 * [new tag] applied/44-1 -> applied/44-1 * [new tag] applied/44-10 -> applied/44-10 * [new tag] applied/44-11 -> applied/44-11 * [new tag] applied/44-12 -> applied/44-12 * [new tag] applied/44-2 -> applied/44-2 * [new tag] applied/44-3 -> applied/44-3 * [new tag] applied/44-4 -> applied/44-4 * [new tag] applied/44-5 -> applied/44-5 * [new tag] applied/44-6 -> applied/44-6 * [new tag] applied/44-7 -> applied/44-7 * [new tag] applied/44-8 -> applied/44-8 * [new tag] applied/44-9 -> applied/44-9 * [new tag] applied/8-2 -> applied/8-2 * [new tag] import/198-0ubuntu1 -> import/198-0ubuntu1 * [new tag] import/198-0ubuntu10 -> import/198-0ubuntu10 * [new tag] import/198-0ubuntu12 -> import/198-0ubuntu12 * [new tag] import/198-0ubuntu2 -> import/198-0ubuntu2 * [new tag] import/198-0ubuntu3 -> import/198-0ubuntu3 * [new tag] import/198-0ubuntu4 -> import/198-0ubuntu4 * [new tag] import/198-0ubuntu5 -> import/198-0ubuntu5 * [new tag] import/198-0ubuntu6 -> import/198-0ubuntu6 * [new tag] import/198-0ubuntu7 -> import/198-0ubuntu7 * [new tag] import/198-0ubuntu8 -> import/198-0ubuntu8 * [new tag] import/198-0ubuntu9 -> import/198-0ubuntu9 * [new tag] import/202-0ubuntu1 -> import/202-0ubuntu1 * [new tag] import/202-0ubuntu10 -> import/202-0ubuntu10 * [new tag] import/202-0ubuntu11 -> import/202-0ubuntu11 * [new tag] import/202-0ubuntu12 -> import/202-0ubuntu12 * [new tag] import/202-0ubuntu2 -> import/202-0ubuntu2 * [new tag] import/202-0ubuntu3 -> import/202-0ubuntu3 * [new tag] import/202-0ubuntu4 -> import/202-0ubuntu4 * [new tag] import/202-0ubuntu5 -> import/202-0ubuntu5 * [new tag] import/202-0ubuntu6 -> import/202-0ubuntu6 * [new tag] import/202-0ubuntu7 -> import/202-0ubuntu7 * [new tag] import/202-0ubuntu8 -> import/202-0ubuntu8 * [new tag] import/202-0ubuntu9 -> import/202-0ubuntu9 * [new tag] import/204-0ubuntu1 -> import/204-0ubuntu1 * [new tag] import/204-0ubuntu10 -> import/204-0ubuntu10 * [new tag] import/204-0ubuntu11 -> import/204-0ubuntu11 * [new tag] import/204-0ubuntu12 -> import/204-0ubuntu12 * [new tag] import/204-0ubuntu13 -> import/204-0ubuntu13 * [new tag] import/204-0ubuntu14 -> import/204-0ubuntu14 * [new tag] import/204-0ubuntu15 -> import/204-0ubuntu15 * [new tag] import/204-0ubuntu16 -> import/204-0ubuntu16 * [new tag] import/204-0ubuntu17 -> import/204-0ubuntu17 * [new tag] import/204-0ubuntu19 -> import/204-0ubuntu19 * [new tag] import/204-0ubuntu19.1 -> import/204-0ubuntu19.1 * [new tag] import/204-0ubuntu2 -> import/204-0ubuntu2 * [new tag] import/204-0ubuntu3 -> import/204-0ubuntu3 * [new tag] import/204-0ubuntu4 -> import/204-0ubuntu4 * [new tag] import/204-0ubuntu5 -> import/204-0ubuntu5 * [new tag] import/204-0ubuntu6 -> import/204-0ubuntu6 * [new tag] import/204-0ubuntu7 -> import/204-0ubuntu7 * [new tag] import/204-0ubuntu8 -> import/204-0ubuntu8 * [new tag] import/204-0ubuntu9 -> import/204-0ubuntu9 * [new tag] import/204-5ubuntu1 -> import/204-5ubuntu1 * [new tag] import/204-5ubuntu10 -> import/204-5ubuntu10 * [new tag] import/204-5ubuntu11 -> import/204-5ubuntu11 * [new tag] import/204-5ubuntu12 -> import/204-5ubuntu12 * [new tag] import/204-5ubuntu13 -> import/204-5ubuntu13 * [new tag] import/204-5ubuntu14 -> import/204-5ubuntu14 * [new tag] import/204-5ubuntu15 -> import/204-5ubuntu15 * [new tag] import/204-5ubuntu16 -> import/204-5ubuntu16 * [new tag] import/204-5ubuntu17 -> import/204-5ubuntu17 * [new tag] import/204-5ubuntu18 -> import/204-5ubuntu18 * [new tag] import/204-5ubuntu19 -> import/204-5ubuntu19 * [new tag] import/204-5ubuntu2 -> import/204-5ubuntu2 * [new tag] import/204-5ubuntu20.1 -> import/204-5ubuntu20.1 * [new tag] import/204-5ubuntu20.10 -> import/204-5ubuntu20.10 * [new tag] import/204-5ubuntu20.11 -> import/204-5ubuntu20.11 * [new tag] import/204-5ubuntu20.12 -> import/204-5ubuntu20.12 * [new tag] import/204-5ubuntu20.13 -> import/204-5ubuntu20.13 * [new tag] import/204-5ubuntu20.14 -> import/204-5ubuntu20.14 * [new tag] import/204-5ubuntu20.15 -> import/204-5ubuntu20.15 * [new tag] import/204-5ubuntu20.18 -> import/204-5ubuntu20.18 * [new tag] import/204-5ubuntu20.19 -> import/204-5ubuntu20.19 * [new tag] import/204-5ubuntu20.2 -> import/204-5ubuntu20.2 * [new tag] import/204-5ubuntu20.20 -> import/204-5ubuntu20.20 * [new tag] import/204-5ubuntu20.21 -> import/204-5ubuntu20.21 * [new tag] import/204-5ubuntu20.22 -> import/204-5ubuntu20.22 * [new tag] import/204-5ubuntu20.24 -> import/204-5ubuntu20.24 * [new tag] import/204-5ubuntu20.25 -> import/204-5ubuntu20.25 * [new tag] import/204-5ubuntu20.26 -> import/204-5ubuntu20.26 * [new tag] import/204-5ubuntu20.28 -> import/204-5ubuntu20.28 * [new tag] import/204-5ubuntu20.3 -> import/204-5ubuntu20.3 * [new tag] import/204-5ubuntu20.4 -> import/204-5ubuntu20.4 * [new tag] import/204-5ubuntu20.5 -> import/204-5ubuntu20.5 * [new tag] import/204-5ubuntu20.6 -> import/204-5ubuntu20.6 * [new tag] import/204-5ubuntu20.7 -> import/204-5ubuntu20.7 * [new tag] import/204-5ubuntu20.8 -> import/204-5ubuntu20.8 * [new tag] import/204-5ubuntu20.9 -> import/204-5ubuntu20.9 * [new tag] import/204-5ubuntu3 -> import/204-5ubuntu3 * [new tag] import/204-5ubuntu4 -> import/204-5ubuntu4 * [new tag] import/204-5ubuntu5 -> import/204-5ubuntu5 * [new tag] import/204-5ubuntu6 -> import/204-5ubuntu6 * [new tag] import/204-5ubuntu7 -> import/204-5ubuntu7 * [new tag] import/204-5ubuntu8 -> import/204-5ubuntu8 * [new tag] import/204-5ubuntu9 -> import/204-5ubuntu9 * [new tag] import/208-8ubuntu1 -> import/208-8ubuntu1 * [new tag] import/208-8ubuntu2 -> import/208-8ubuntu2 * [new tag] import/208-8ubuntu3 -> import/208-8ubuntu3 * [new tag] import/208-8ubuntu4 -> import/208-8ubuntu4 * [new tag] import/208-8ubuntu5 -> import/208-8ubuntu5 * [new tag] import/208-8ubuntu6 -> import/208-8ubuntu6 * [new tag] import/208-8ubuntu7 -> import/208-8ubuntu7 * [new tag] import/208-8ubuntu8.1 -> import/208-8ubuntu8.1 * [new tag] import/215-10 -> import/215-10 * [new tag] import/215-11 -> import/215-11 * [new tag] import/215-12 -> import/215-12 * [new tag] import/215-13 -> import/215-13 * [new tag] import/215-14 -> import/215-14 * [new tag] import/215-15 -> import/215-15 * [new tag] import/215-16 -> import/215-16 * [new tag] import/215-17 -> import/215-17 * [new tag] import/215-17+deb8u1 -> import/215-17+deb8u1 * [new tag] import/215-17+deb8u2 -> import/215-17+deb8u2 * [new tag] import/215-17+deb8u3 -> import/215-17+deb8u3 * [new tag] import/215-17+deb8u4 -> import/215-17+deb8u4 * [new tag] import/215-17+deb8u5 -> import/215-17+deb8u5 * [new tag] import/215-17+deb8u6 -> import/215-17+deb8u6 * [new tag] import/215-8 -> import/215-8 * [new tag] import/215-9 -> import/215-9 * [new tag] import/219-7ubuntu1 -> import/219-7ubuntu1 * [new tag] import/219-7ubuntu2 -> import/219-7ubuntu2 * [new tag] import/219-7ubuntu4 -> import/219-7ubuntu4 * [new tag] import/219-7ubuntu5 -> import/219-7ubuntu5 * [new tag] import/225-1ubuntu1 -> import/225-1ubuntu1 * [new tag] import/225-1ubuntu2 -> import/225-1ubuntu2 * [new tag] import/225-1ubuntu3 -> import/225-1ubuntu3 * [new tag] import/225-1ubuntu4 -> import/225-1ubuntu4 * [new tag] import/225-1ubuntu5 -> import/225-1ubuntu5 * [new tag] import/225-1ubuntu6 -> import/225-1ubuntu6 * [new tag] import/225-1ubuntu7 -> import/225-1ubuntu7 * [new tag] import/225-1ubuntu8 -> import/225-1ubuntu8 * [new tag] import/229-4ubuntu1 -> import/229-4ubuntu1 * [new tag] import/229-4ubuntu10 -> import/229-4ubuntu10 * [new tag] import/229-4ubuntu11 -> import/229-4ubuntu11 * [new tag] import/229-4ubuntu12 -> import/229-4ubuntu12 * [new tag] import/229-4ubuntu13 -> import/229-4ubuntu13 * [new tag] import/229-4ubuntu16 -> import/229-4ubuntu16 * [new tag] import/229-4ubuntu17 -> import/229-4ubuntu17 * [new tag] import/229-4ubuntu18 -> import/229-4ubuntu18 * [new tag] import/229-4ubuntu19 -> import/229-4ubuntu19 * [new tag] import/229-4ubuntu2 -> import/229-4ubuntu2 * [new tag] import/229-4ubuntu20 -> import/229-4ubuntu20 * [new tag] import/229-4ubuntu21 -> import/229-4ubuntu21 * [new tag] import/229-4ubuntu21.1 -> import/229-4ubuntu21.1 * [new tag] import/229-4ubuntu21.10 -> import/229-4ubuntu21.10 * [new tag] import/229-4ubuntu21.15 -> import/229-4ubuntu21.15 * [new tag] import/229-4ubuntu21.16 -> import/229-4ubuntu21.16 * [new tag] import/229-4ubuntu21.17 -> import/229-4ubuntu21.17 * [new tag] import/229-4ubuntu21.18 -> import/229-4ubuntu21.18 * [new tag] import/229-4ubuntu21.19 -> import/229-4ubuntu21.19 * [new tag] import/229-4ubuntu21.2 -> import/229-4ubuntu21.2 * [new tag] import/229-4ubuntu21.21 -> import/229-4ubuntu21.21 * [new tag] import/229-4ubuntu21.22 -> import/229-4ubuntu21.22 * [new tag] import/229-4ubuntu21.23 -> import/229-4ubuntu21.23 * [new tag] import/229-4ubuntu21.28 -> import/229-4ubuntu21.28 * [new tag] import/229-4ubuntu21.3 -> import/229-4ubuntu21.3 * [new tag] import/229-4ubuntu21.30 -> import/229-4ubuntu21.30 * [new tag] import/229-4ubuntu21.4 -> import/229-4ubuntu21.4 * [new tag] import/229-4ubuntu21.5 -> import/229-4ubuntu21.5 * [new tag] import/229-4ubuntu21.6 -> import/229-4ubuntu21.6 * [new tag] import/229-4ubuntu21.8 -> import/229-4ubuntu21.8 * [new tag] import/229-4ubuntu21.9 -> import/229-4ubuntu21.9 * [new tag] import/229-4ubuntu3 -> import/229-4ubuntu3 * [new tag] import/229-4ubuntu5 -> import/229-4ubuntu5 * [new tag] import/229-4ubuntu6 -> import/229-4ubuntu6 * [new tag] import/229-4ubuntu7 -> import/229-4ubuntu7 * [new tag] import/229-4ubuntu8 -> import/229-4ubuntu8 * [new tag] import/231-9ubuntu1 -> import/231-9ubuntu1 * [new tag] import/231-9ubuntu2 -> import/231-9ubuntu2 * [new tag] import/231-9ubuntu3 -> import/231-9ubuntu3 * [new tag] import/232-20 -> import/232-20 * [new tag] import/232-21 -> import/232-21 * [new tag] import/232-21ubuntu1 -> import/232-21ubuntu1 * [new tag] import/232-21ubuntu3 -> import/232-21ubuntu3 * [new tag] import/232-21ubuntu4 -> import/232-21ubuntu4 * [new tag] import/232-21ubuntu5 -> import/232-21ubuntu5 * [new tag] import/232-21ubuntu6 -> import/232-21ubuntu6 * [new tag] import/232-22 -> import/232-22 * [new tag] import/232-23 -> import/232-23 * [new tag] import/232-24 -> import/232-24 * [new tag] import/232-25 -> import/232-25 * [new tag] import/232-25+deb9u1 -> import/232-25+deb9u1 * [new tag] import/232-25+deb9u11 -> import/232-25+deb9u11 * [new tag] import/232-25+deb9u2 -> import/232-25+deb9u2 * [new tag] import/232-25+deb9u4 -> import/232-25+deb9u4 * [new tag] import/232-25+deb9u6 -> import/232-25+deb9u6 * [new tag] import/232-25+deb9u8 -> import/232-25+deb9u8 * [new tag] import/234-2ubuntu1 -> import/234-2ubuntu1 * [new tag] import/234-2ubuntu10 -> import/234-2ubuntu10 * [new tag] import/234-2ubuntu11 -> import/234-2ubuntu11 * [new tag] import/234-2ubuntu12.3 -> import/234-2ubuntu12.3 * [new tag] import/234-2ubuntu2 -> import/234-2ubuntu2 * [new tag] import/234-2ubuntu3 -> import/234-2ubuntu3 * [new tag] import/234-2ubuntu4 -> import/234-2ubuntu4 * [new tag] import/234-2ubuntu5 -> import/234-2ubuntu5 * [new tag] import/234-2ubuntu6 -> import/234-2ubuntu6 * [new tag] import/234-2ubuntu7 -> import/234-2ubuntu7 * [new tag] import/234-2ubuntu8 -> import/234-2ubuntu8 * [new tag] import/234-2ubuntu9 -> import/234-2ubuntu9 * [new tag] import/237-3ubuntu1 -> import/237-3ubuntu1 * [new tag] import/237-3ubuntu10.1 -> import/237-3ubuntu10.1 * [new tag] import/237-3ubuntu10.11 -> import/237-3ubuntu10.11 * [new tag] import/237-3ubuntu10.12 -> import/237-3ubuntu10.12 * [new tag] import/237-3ubuntu10.13 -> import/237-3ubuntu10.13 * [new tag] import/237-3ubuntu10.15 -> import/237-3ubuntu10.15 * [new tag] import/237-3ubuntu10.16 -> import/237-3ubuntu10.16 * [new tag] import/237-3ubuntu10.17 -> import/237-3ubuntu10.17 * [new tag] import/237-3ubuntu10.19 -> import/237-3ubuntu10.19 * [new tag] import/237-3ubuntu10.2 -> import/237-3ubuntu10.2 * [new tag] import/237-3ubuntu10.20 -> import/237-3ubuntu10.20 * [new tag] import/237-3ubuntu10.21 -> import/237-3ubuntu10.21 * [new tag] import/237-3ubuntu10.22 -> import/237-3ubuntu10.22 * [new tag] import/237-3ubuntu10.23 -> import/237-3ubuntu10.23 * [new tag] import/237-3ubuntu10.24 -> import/237-3ubuntu10.24 * [new tag] import/237-3ubuntu10.25 -> import/237-3ubuntu10.25 * [new tag] import/237-3ubuntu10.26 -> import/237-3ubuntu10.26 * [new tag] import/237-3ubuntu10.28 -> import/237-3ubuntu10.28 * [new tag] import/237-3ubuntu10.29 -> import/237-3ubuntu10.29 * [new tag] import/237-3ubuntu10.3 -> import/237-3ubuntu10.3 * [new tag] import/237-3ubuntu10.31 -> import/237-3ubuntu10.31 * [new tag] import/237-3ubuntu10.32 -> import/237-3ubuntu10.32 * [new tag] import/237-3ubuntu10.33 -> import/237-3ubuntu10.33 * [new tag] import/237-3ubuntu10.39 -> import/237-3ubuntu10.39 * [new tag] import/237-3ubuntu10.4 -> import/237-3ubuntu10.4 * [new tag] import/237-3ubuntu10.40 -> import/237-3ubuntu10.40 * [new tag] import/237-3ubuntu10.41 -> import/237-3ubuntu10.41 * [new tag] import/237-3ubuntu10.42 -> import/237-3ubuntu10.42 * [new tag] import/237-3ubuntu10.43 -> import/237-3ubuntu10.43 * [new tag] import/237-3ubuntu10.44 -> import/237-3ubuntu10.44 * [new tag] import/237-3ubuntu10.6 -> import/237-3ubuntu10.6 * [new tag] import/237-3ubuntu10.9 -> import/237-3ubuntu10.9 * [new tag] import/237-3ubuntu2 -> import/237-3ubuntu2 * [new tag] import/237-3ubuntu3 -> import/237-3ubuntu3 * [new tag] import/237-3ubuntu4 -> import/237-3ubuntu4 * [new tag] import/237-3ubuntu5 -> import/237-3ubuntu5 * [new tag] import/237-3ubuntu6 -> import/237-3ubuntu6 * [new tag] import/237-3ubuntu7 -> import/237-3ubuntu7 * [new tag] import/237-3ubuntu8 -> import/237-3ubuntu8 * [new tag] import/237-3ubuntu9 -> import/237-3ubuntu9 * [new tag] import/239-7ubuntu1 -> import/239-7ubuntu1 * [new tag] import/239-7ubuntu10.1 -> import/239-7ubuntu10.1 * [new tag] import/239-7ubuntu10.10 -> import/239-7ubuntu10.10 * [new tag] import/239-7ubuntu10.11 -> import/239-7ubuntu10.11 * [new tag] import/239-7ubuntu10.13 -> import/239-7ubuntu10.13 * [new tag] import/239-7ubuntu10.3 -> import/239-7ubuntu10.3 * [new tag] import/239-7ubuntu10.4 -> import/239-7ubuntu10.4 * [new tag] import/239-7ubuntu10.6 -> import/239-7ubuntu10.6 * [new tag] import/239-7ubuntu10.7 -> import/239-7ubuntu10.7 * [new tag] import/239-7ubuntu10.8 -> import/239-7ubuntu10.8 * [new tag] import/239-7ubuntu2 -> import/239-7ubuntu2 * [new tag] import/239-7ubuntu3 -> import/239-7ubuntu3 * [new tag] import/239-7ubuntu4 -> import/239-7ubuntu4 * [new tag] import/239-7ubuntu5 -> import/239-7ubuntu5 * [new tag] import/239-7ubuntu6 -> import/239-7ubuntu6 * [new tag] import/239-7ubuntu7 -> import/239-7ubuntu7 * [new tag] import/239-7ubuntu8 -> import/239-7ubuntu8 * [new tag] import/239-7ubuntu9 -> import/239-7ubuntu9 * [new tag] import/240-6ubuntu1 -> import/240-6ubuntu1 * [new tag] import/240-6ubuntu2 -> import/240-6ubuntu2 * [new tag] import/240-6ubuntu3 -> import/240-6ubuntu3 * [new tag] import/240-6ubuntu4 -> import/240-6ubuntu4 * [new tag] import/240-6ubuntu5.1 -> import/240-6ubuntu5.1 * [new tag] import/240-6ubuntu5.2 -> import/240-6ubuntu5.2 * [new tag] import/240-6ubuntu5.3 -> import/240-6ubuntu5.3 * [new tag] import/240-6ubuntu5.4 -> import/240-6ubuntu5.4 * [new tag] import/240-6ubuntu5.6 -> import/240-6ubuntu5.6 * [new tag] import/241-4 -> import/241-4 * [new tag] import/241-5 -> import/241-5 * [new tag] import/241-6 -> import/241-6 * [new tag] import/241-7 -> import/241-7 * [new tag] import/241-7_deb10u1 -> import/241-7_deb10u1 * [new tag] import/241-7_deb10u2 -> import/241-7_deb10u2 * [new tag] import/241-7_deb10u3 -> import/241-7_deb10u3 * [new tag] import/241-7_deb10u4 -> import/241-7_deb10u4 * [new tag] import/241-7_deb10u5 -> import/241-7_deb10u5 * [new tag] import/241-7_deb10u6 -> import/241-7_deb10u6 * [new tag] import/242-6 -> import/242-6 * [new tag] import/242-7 -> import/242-7 * [new tag] import/242-7ubuntu1 -> import/242-7ubuntu1 * [new tag] import/242-7ubuntu2 -> import/242-7ubuntu2 * [new tag] import/242-7ubuntu3.2 -> import/242-7ubuntu3.2 * [new tag] import/242-7ubuntu3.6 -> import/242-7ubuntu3.6 * [new tag] import/242-7ubuntu3.7 -> import/242-7ubuntu3.7 * [new tag] import/242-7ubuntu3.8 -> import/242-7ubuntu3.8 * [new tag] import/242-7ubuntu3.9 -> import/242-7ubuntu3.9 * [new tag] import/245.4-4ubuntu1 -> import/245.4-4ubuntu1 * [new tag] import/245.4-4ubuntu3.1 -> import/245.4-4ubuntu3.1 * [new tag] import/245.4-4ubuntu3.2 -> import/245.4-4ubuntu3.2 * [new tag] import/245.4-4ubuntu3.3 -> import/245.4-4ubuntu3.3 * [new tag] import/245.4-4ubuntu3.4 -> import/245.4-4ubuntu3.4 * [new tag] import/245.4-4ubuntu3.5 -> import/245.4-4ubuntu3.5 * [new tag] import/246.6-1ubuntu1.1 -> import/246.6-1ubuntu1.1 * [new tag] import/246.6-1ubuntu1.2 -> import/246.6-1ubuntu1.2 Auto-merging units/var-lib-machines.mount CONFLICT (add/add): Merge conflict in units/var-lib-machines.mount Auto-merging units/user@.service.in CONFLICT (add/add): Merge conflict in units/user@.service.in Auto-merging units/user/xdg-desktop-autostart.target CONFLICT (add/add): Merge conflict in units/user/xdg-desktop-autostart.target Auto-merging units/user/timers.target CONFLICT (add/add): Merge conflict in units/user/timers.target Auto-merging units/user/systemd-tmpfiles-setup.service CONFLICT (add/add): Merge conflict in units/user/systemd-tmpfiles-setup.service Auto-merging units/user/systemd-tmpfiles-clean.timer CONFLICT (add/add): Merge conflict in units/user/systemd-tmpfiles-clean.timer Auto-merging units/user/systemd-tmpfiles-clean.service CONFLICT (add/add): Merge conflict in units/user/systemd-tmpfiles-clean.service Auto-merging units/user/systemd-exit.service CONFLICT (add/add): Merge conflict in units/user/systemd-exit.service Auto-merging units/user/sound.target CONFLICT (add/add): Merge conflict in units/user/sound.target Auto-merging units/user/sockets.target CONFLICT (add/add): Merge conflict in units/user/sockets.target Auto-merging units/user/smartcard.target CONFLICT (add/add): Merge conflict in units/user/smartcard.target Auto-merging units/user/shutdown.target CONFLICT (add/add): Merge conflict in units/user/shutdown.target Auto-merging units/user/printer.target CONFLICT (add/add): Merge conflict in units/user/printer.target Auto-merging units/user/paths.target CONFLICT (add/add): Merge conflict in units/user/paths.target Auto-merging units/user/meson.build CONFLICT (add/add): Merge conflict in units/user/meson.build Auto-merging units/user/graphical-session.target CONFLICT (add/add): Merge conflict in units/user/graphical-session.target Auto-merging units/user/graphical-session-pre.target CONFLICT (add/add): Merge conflict in units/user/graphical-session-pre.target Auto-merging units/user/exit.target CONFLICT (add/add): Merge conflict in units/user/exit.target Auto-merging units/user/default.target CONFLICT (add/add): Merge conflict in units/user/default.target Auto-merging units/user/bluetooth.target CONFLICT (add/add): Merge conflict in units/user/bluetooth.target Auto-merging units/user/basic.target CONFLICT (add/add): Merge conflict in units/user/basic.target Auto-merging units/user.slice CONFLICT (add/add): Merge conflict in units/user.slice Auto-merging units/user-runtime-dir@.service.in CONFLICT (add/add): Merge conflict in units/user-runtime-dir@.service.in Auto-merging units/user-.slice.d/10-defaults.conf CONFLICT (add/add): Merge conflict in units/user-.slice.d/10-defaults.conf Auto-merging units/usb-gadget.target CONFLICT (add/add): Merge conflict in units/usb-gadget.target Auto-merging units/umount.target CONFLICT (add/add): Merge conflict in units/umount.target Auto-merging units/tmp.mount CONFLICT (add/add): Merge conflict in units/tmp.mount Auto-merging units/timers.target CONFLICT (add/add): Merge conflict in units/timers.target Auto-merging units/time-sync.target CONFLICT (add/add): Merge conflict in units/time-sync.target Auto-merging units/time-set.target CONFLICT (add/add): Merge conflict in units/time-set.target Auto-merging units/systemd-volatile-root.service.in CONFLICT (add/add): Merge conflict in units/systemd-volatile-root.service.in Auto-merging units/systemd-vconsole-setup.service.in CONFLICT (add/add): Merge conflict in units/systemd-vconsole-setup.service.in Auto-merging units/systemd-userdbd.socket CONFLICT (add/add): Merge conflict in units/systemd-userdbd.socket Auto-merging units/systemd-userdbd.service.in CONFLICT (add/add): Merge conflict in units/systemd-userdbd.service.in Auto-merging units/systemd-user-sessions.service.in CONFLICT (add/add): Merge conflict in units/systemd-user-sessions.service.in Auto-merging units/systemd-update-utmp.service.in CONFLICT (add/add): Merge conflict in units/systemd-update-utmp.service.in Auto-merging units/systemd-update-utmp-runlevel.service.in CONFLICT (add/add): Merge conflict in units/systemd-update-utmp-runlevel.service.in Auto-merging units/systemd-update-done.service.in CONFLICT (add/add): Merge conflict in units/systemd-update-done.service.in Auto-merging units/systemd-udevd.service.in CONFLICT (add/add): Merge conflict in units/systemd-udevd.service.in Auto-merging units/systemd-udevd-kernel.socket CONFLICT (add/add): Merge conflict in units/systemd-udevd-kernel.socket Auto-merging units/systemd-udevd-control.socket CONFLICT (add/add): Merge conflict in units/systemd-udevd-control.socket Auto-merging units/systemd-udev-trigger.service CONFLICT (add/add): Merge conflict in units/systemd-udev-trigger.service Auto-merging units/systemd-udev-settle.service CONFLICT (add/add): Merge conflict in units/systemd-udev-settle.service Auto-merging units/systemd-tmpfiles-setup.service CONFLICT (add/add): Merge conflict in units/systemd-tmpfiles-setup.service Auto-merging units/systemd-tmpfiles-setup-dev.service CONFLICT (add/add): Merge conflict in units/systemd-tmpfiles-setup-dev.service Auto-merging units/systemd-tmpfiles-clean.timer CONFLICT (add/add): Merge conflict in units/systemd-tmpfiles-clean.timer Auto-merging units/systemd-tmpfiles-clean.service CONFLICT (add/add): Merge conflict in units/systemd-tmpfiles-clean.service Auto-merging units/systemd-timesyncd.service.in CONFLICT (add/add): Merge conflict in units/systemd-timesyncd.service.in Auto-merging units/systemd-timedated.service.in CONFLICT (add/add): Merge conflict in units/systemd-timedated.service.in Auto-merging units/systemd-time-wait-sync.service.in CONFLICT (add/add): Merge conflict in units/systemd-time-wait-sync.service.in Auto-merging units/systemd-sysusers.service CONFLICT (add/add): Merge conflict in units/systemd-sysusers.service Auto-merging units/systemd-sysctl.service.in CONFLICT (add/add): Merge conflict in units/systemd-sysctl.service.in Auto-merging units/systemd-suspend.service.in CONFLICT (add/add): Merge conflict in units/systemd-suspend.service.in Auto-merging units/systemd-suspend-then-hibernate.service.in CONFLICT (add/add): Merge conflict in units/systemd-suspend-then-hibernate.service.in Auto-merging units/systemd-rfkill.socket CONFLICT (add/add): Merge conflict in units/systemd-rfkill.socket Auto-merging units/systemd-rfkill.service.in CONFLICT (add/add): Merge conflict in units/systemd-rfkill.service.in Auto-merging units/systemd-resolved.service.in CONFLICT (add/add): Merge conflict in units/systemd-resolved.service.in Auto-merging units/systemd-repart.service.in CONFLICT (add/add): Merge conflict in units/systemd-repart.service.in Auto-merging units/systemd-remount-fs.service.in CONFLICT (add/add): Merge conflict in units/systemd-remount-fs.service.in Auto-merging units/systemd-reboot.service CONFLICT (add/add): Merge conflict in units/systemd-reboot.service Auto-merging units/systemd-random-seed.service.in CONFLICT (add/add): Merge conflict in units/systemd-random-seed.service.in Auto-merging units/systemd-quotacheck.service.in CONFLICT (add/add): Merge conflict in units/systemd-quotacheck.service.in Auto-merging units/systemd-pstore.service.in CONFLICT (add/add): Merge conflict in units/systemd-pstore.service.in Auto-merging units/systemd-poweroff.service CONFLICT (add/add): Merge conflict in units/systemd-poweroff.service Auto-merging units/systemd-portabled.service.in CONFLICT (add/add): Merge conflict in units/systemd-portabled.service.in Auto-merging units/systemd-nspawn@.service.in CONFLICT (add/add): Merge conflict in units/systemd-nspawn@.service.in Auto-merging units/systemd-networkd.socket CONFLICT (add/add): Merge conflict in units/systemd-networkd.socket Auto-merging units/systemd-networkd.service.in CONFLICT (add/add): Merge conflict in units/systemd-networkd.service.in Auto-merging units/systemd-networkd-wait-online.service.in CONFLICT (add/add): Merge conflict in units/systemd-networkd-wait-online.service.in Auto-merging units/systemd-network-generator.service.in CONFLICT (add/add): Merge conflict in units/systemd-network-generator.service.in Auto-merging units/systemd-modules-load.service.in CONFLICT (add/add): Merge conflict in units/systemd-modules-load.service.in Auto-merging units/systemd-machined.service.in CONFLICT (add/add): Merge conflict in units/systemd-machined.service.in Auto-merging units/systemd-machine-id-commit.service CONFLICT (add/add): Merge conflict in units/systemd-machine-id-commit.service Auto-merging units/systemd-logind.service.in CONFLICT (add/add): Merge conflict in units/systemd-logind.service.in Auto-merging units/systemd-localed.service.in CONFLICT (add/add): Merge conflict in units/systemd-localed.service.in Auto-merging units/systemd-kexec.service CONFLICT (add/add): Merge conflict in units/systemd-kexec.service Auto-merging units/systemd-journald@.socket CONFLICT (add/add): Merge conflict in units/systemd-journald@.socket Auto-merging units/systemd-journald@.service.in CONFLICT (add/add): Merge conflict in units/systemd-journald@.service.in Auto-merging units/systemd-journald.socket CONFLICT (add/add): Merge conflict in units/systemd-journald.socket Auto-merging units/systemd-journald.service.in CONFLICT (add/add): Merge conflict in units/systemd-journald.service.in Auto-merging units/systemd-journald-varlink@.socket CONFLICT (add/add): Merge conflict in units/systemd-journald-varlink@.socket Auto-merging units/systemd-journald-dev-log.socket CONFLICT (add/add): Merge conflict in units/systemd-journald-dev-log.socket Auto-merging units/systemd-journald-audit.socket CONFLICT (add/add): Merge conflict in units/systemd-journald-audit.socket Auto-merging units/systemd-journal-upload.service.in CONFLICT (add/add): Merge conflict in units/systemd-journal-upload.service.in Auto-merging units/systemd-journal-remote.socket CONFLICT (add/add): Merge conflict in units/systemd-journal-remote.socket Auto-merging units/systemd-journal-remote.service.in CONFLICT (add/add): Merge conflict in units/systemd-journal-remote.service.in Auto-merging units/systemd-journal-gatewayd.socket CONFLICT (add/add): Merge conflict in units/systemd-journal-gatewayd.socket Auto-merging units/systemd-journal-gatewayd.service.in CONFLICT (add/add): Merge conflict in units/systemd-journal-gatewayd.service.in Auto-merging units/systemd-journal-flush.service CONFLICT (add/add): Merge conflict in units/systemd-journal-flush.service Auto-merging units/systemd-journal-catalog-update.service CONFLICT (add/add): Merge conflict in units/systemd-journal-catalog-update.service Auto-merging units/systemd-initctl.socket CONFLICT (add/add): Merge conflict in units/systemd-initctl.socket Auto-merging units/systemd-initctl.service.in CONFLICT (add/add): Merge conflict in units/systemd-initctl.service.in Auto-merging units/systemd-importd.service.in CONFLICT (add/add): Merge conflict in units/systemd-importd.service.in Auto-merging units/systemd-hybrid-sleep.service.in CONFLICT (add/add): Merge conflict in units/systemd-hybrid-sleep.service.in Auto-merging units/systemd-hwdb-update.service.in CONFLICT (add/add): Merge conflict in units/systemd-hwdb-update.service.in Auto-merging units/systemd-hostnamed.service.in CONFLICT (add/add): Merge conflict in units/systemd-hostnamed.service.in Auto-merging units/systemd-homed.service.in CONFLICT (add/add): Merge conflict in units/systemd-homed.service.in Auto-merging units/systemd-hibernate.service.in CONFLICT (add/add): Merge conflict in units/systemd-hibernate.service.in Auto-merging units/systemd-hibernate-resume@.service.in CONFLICT (add/add): Merge conflict in units/systemd-hibernate-resume@.service.in Auto-merging units/systemd-halt.service CONFLICT (add/add): Merge conflict in units/systemd-halt.service Auto-merging units/systemd-fsck@.service.in CONFLICT (add/add): Merge conflict in units/systemd-fsck@.service.in Auto-merging units/systemd-fsck-root.service.in CONFLICT (add/add): Merge conflict in units/systemd-fsck-root.service.in Auto-merging units/systemd-firstboot.service CONFLICT (add/add): Merge conflict in units/systemd-firstboot.service Auto-merging units/systemd-exit.service CONFLICT (add/add): Merge conflict in units/systemd-exit.service Auto-merging units/systemd-coredump@.service.in CONFLICT (add/add): Merge conflict in units/systemd-coredump@.service.in Auto-merging units/systemd-coredump.socket CONFLICT (add/add): Merge conflict in units/systemd-coredump.socket Auto-merging units/systemd-boot-system-token.service CONFLICT (add/add): Merge conflict in units/systemd-boot-system-token.service Auto-merging units/systemd-boot-check-no-failures.service.in CONFLICT (add/add): Merge conflict in units/systemd-boot-check-no-failures.service.in Auto-merging units/systemd-bless-boot.service.in CONFLICT (add/add): Merge conflict in units/systemd-bless-boot.service.in Auto-merging units/systemd-binfmt.service.in CONFLICT (add/add): Merge conflict in units/systemd-binfmt.service.in Auto-merging units/systemd-backlight@.service.in CONFLICT (add/add): Merge conflict in units/systemd-backlight@.service.in Auto-merging units/systemd-ask-password-wall.service CONFLICT (add/add): Merge conflict in units/systemd-ask-password-wall.service Auto-merging units/systemd-ask-password-wall.path CONFLICT (add/add): Merge conflict in units/systemd-ask-password-wall.path Auto-merging units/systemd-ask-password-console.service CONFLICT (add/add): Merge conflict in units/systemd-ask-password-console.service Auto-merging units/systemd-ask-password-console.path CONFLICT (add/add): Merge conflict in units/systemd-ask-password-console.path Auto-merging units/system-update.target CONFLICT (add/add): Merge conflict in units/system-update.target Auto-merging units/system-update-pre.target CONFLICT (add/add): Merge conflict in units/system-update-pre.target Auto-merging units/system-update-cleanup.service CONFLICT (add/add): Merge conflict in units/system-update-cleanup.service Auto-merging units/system-systemd\x2dcryptsetup.slice CONFLICT (add/add): Merge conflict in units/system-systemd\x2dcryptsetup.slice Auto-merging units/syslog.socket CONFLICT (add/add): Merge conflict in units/syslog.socket Auto-merging units/sysinit.target CONFLICT (add/add): Merge conflict in units/sysinit.target Auto-merging units/sys-kernel-tracing.mount CONFLICT (add/add): Merge conflict in units/sys-kernel-tracing.mount Auto-merging units/sys-kernel-debug.mount CONFLICT (add/add): Merge conflict in units/sys-kernel-debug.mount Auto-merging units/sys-kernel-config.mount CONFLICT (add/add): Merge conflict in units/sys-kernel-config.mount Auto-merging units/sys-fs-fuse-connections.mount CONFLICT (add/add): Merge conflict in units/sys-fs-fuse-connections.mount Auto-merging units/swap.target CONFLICT (add/add): Merge conflict in units/swap.target Auto-merging units/suspend.target CONFLICT (add/add): Merge conflict in units/suspend.target Auto-merging units/suspend-then-hibernate.target CONFLICT (add/add): Merge conflict in units/suspend-then-hibernate.target Auto-merging units/sound.target CONFLICT (add/add): Merge conflict in units/sound.target Auto-merging units/sockets.target CONFLICT (add/add): Merge conflict in units/sockets.target Auto-merging units/smartcard.target CONFLICT (add/add): Merge conflict in units/smartcard.target Auto-merging units/slices.target CONFLICT (add/add): Merge conflict in units/slices.target Auto-merging units/sleep.target CONFLICT (add/add): Merge conflict in units/sleep.target Auto-merging units/sigpwr.target CONFLICT (add/add): Merge conflict in units/sigpwr.target Auto-merging units/shutdown.target CONFLICT (add/add): Merge conflict in units/shutdown.target Auto-merging units/serial-getty@.service.m4 CONFLICT (add/add): Merge conflict in units/serial-getty@.service.m4 Auto-merging units/rpcbind.target CONFLICT (add/add): Merge conflict in units/rpcbind.target Auto-merging units/rescue.target CONFLICT (add/add): Merge conflict in units/rescue.target Auto-merging units/rescue.service.in CONFLICT (add/add): Merge conflict in units/rescue.service.in Auto-merging units/remote-fs.target CONFLICT (add/add): Merge conflict in units/remote-fs.target Auto-merging units/remote-fs-pre.target CONFLICT (add/add): Merge conflict in units/remote-fs-pre.target Auto-merging units/remote-cryptsetup.target CONFLICT (add/add): Merge conflict in units/remote-cryptsetup.target Auto-merging units/reboot.target CONFLICT (add/add): Merge conflict in units/reboot.target Auto-merging units/rc-local.service.in CONFLICT (add/add): Merge conflict in units/rc-local.service.in Auto-merging units/quotaon.service.in CONFLICT (add/add): Merge conflict in units/quotaon.service.in Auto-merging units/proc-sys-fs-binfmt_misc.mount CONFLICT (add/add): Merge conflict in units/proc-sys-fs-binfmt_misc.mount Auto-merging units/proc-sys-fs-binfmt_misc.automount CONFLICT (add/add): Merge conflict in units/proc-sys-fs-binfmt_misc.automount Auto-merging units/printer.target CONFLICT (add/add): Merge conflict in units/printer.target Auto-merging units/poweroff.target CONFLICT (add/add): Merge conflict in units/poweroff.target Auto-merging units/paths.target CONFLICT (add/add): Merge conflict in units/paths.target Auto-merging units/nss-user-lookup.target CONFLICT (add/add): Merge conflict in units/nss-user-lookup.target Auto-merging units/nss-lookup.target CONFLICT (add/add): Merge conflict in units/nss-lookup.target Auto-merging units/network.target CONFLICT (add/add): Merge conflict in units/network.target Auto-merging units/network-pre.target CONFLICT (add/add): Merge conflict in units/network-pre.target Auto-merging units/network-online.target CONFLICT (add/add): Merge conflict in units/network-online.target Auto-merging units/multi-user.target CONFLICT (add/add): Merge conflict in units/multi-user.target Auto-merging units/modprobe@.service CONFLICT (add/add): Merge conflict in units/modprobe@.service Auto-merging units/meson.build CONFLICT (add/add): Merge conflict in units/meson.build Auto-merging units/machines.target CONFLICT (add/add): Merge conflict in units/machines.target Auto-merging units/machine.slice CONFLICT (add/add): Merge conflict in units/machine.slice Auto-merging units/local-fs.target CONFLICT (add/add): Merge conflict in units/local-fs.target Auto-merging units/local-fs-pre.target CONFLICT (add/add): Merge conflict in units/local-fs-pre.target Auto-merging units/ldconfig.service CONFLICT (add/add): Merge conflict in units/ldconfig.service Auto-merging units/kmod-static-nodes.service.in CONFLICT (add/add): Merge conflict in units/kmod-static-nodes.service.in Auto-merging units/kexec.target CONFLICT (add/add): Merge conflict in units/kexec.target Auto-merging units/initrd.target CONFLICT (add/add): Merge conflict in units/initrd.target Auto-merging units/initrd-udevadm-cleanup-db.service CONFLICT (add/add): Merge conflict in units/initrd-udevadm-cleanup-db.service Auto-merging units/initrd-switch-root.target CONFLICT (add/add): Merge conflict in units/initrd-switch-root.target Auto-merging units/initrd-switch-root.service CONFLICT (add/add): Merge conflict in units/initrd-switch-root.service Auto-merging units/initrd-root-fs.target CONFLICT (add/add): Merge conflict in units/initrd-root-fs.target Auto-merging units/initrd-root-device.target CONFLICT (add/add): Merge conflict in units/initrd-root-device.target Auto-merging units/initrd-parse-etc.service CONFLICT (add/add): Merge conflict in units/initrd-parse-etc.service Auto-merging units/initrd-fs.target CONFLICT (add/add): Merge conflict in units/initrd-fs.target Auto-merging units/initrd-cleanup.service CONFLICT (add/add): Merge conflict in units/initrd-cleanup.service Auto-merging units/hybrid-sleep.target CONFLICT (add/add): Merge conflict in units/hybrid-sleep.target Auto-merging units/hibernate.target CONFLICT (add/add): Merge conflict in units/hibernate.target Auto-merging units/halt.target CONFLICT (add/add): Merge conflict in units/halt.target Auto-merging units/graphical.target CONFLICT (add/add): Merge conflict in units/graphical.target Auto-merging units/getty@.service.m4 CONFLICT (add/add): Merge conflict in units/getty@.service.m4 Auto-merging units/getty.target CONFLICT (add/add): Merge conflict in units/getty.target Auto-merging units/getty-pre.target CONFLICT (add/add): Merge conflict in units/getty-pre.target Auto-merging units/final.target CONFLICT (add/add): Merge conflict in units/final.target Auto-merging units/exit.target CONFLICT (add/add): Merge conflict in units/exit.target Auto-merging units/emergency.target CONFLICT (add/add): Merge conflict in units/emergency.target Auto-merging units/emergency.service.in CONFLICT (add/add): Merge conflict in units/emergency.service.in Auto-merging units/dev-mqueue.mount CONFLICT (add/add): Merge conflict in units/dev-mqueue.mount Auto-merging units/dev-hugepages.mount CONFLICT (add/add): Merge conflict in units/dev-hugepages.mount Auto-merging units/debug-shell.service.in CONFLICT (add/add): Merge conflict in units/debug-shell.service.in Auto-merging units/cryptsetup.target CONFLICT (add/add): Merge conflict in units/cryptsetup.target Auto-merging units/cryptsetup-pre.target CONFLICT (add/add): Merge conflict in units/cryptsetup-pre.target Auto-merging units/container-getty@.service.m4 CONFLICT (add/add): Merge conflict in units/container-getty@.service.m4 Auto-merging units/console-getty.service.m4 CONFLICT (add/add): Merge conflict in units/console-getty.service.m4 Auto-merging units/boot-complete.target CONFLICT (add/add): Merge conflict in units/boot-complete.target Auto-merging units/bluetooth.target CONFLICT (add/add): Merge conflict in units/bluetooth.target Auto-merging units/blockdev@.target CONFLICT (add/add): Merge conflict in units/blockdev@.target Auto-merging units/basic.target CONFLICT (add/add): Merge conflict in units/basic.target Auto-merging travis-ci/managers/fuzzbuzz.sh CONFLICT (add/add): Merge conflict in travis-ci/managers/fuzzbuzz.sh Auto-merging travis-ci/managers/fedora.sh CONFLICT (add/add): Merge conflict in travis-ci/managers/fedora.sh Auto-merging travis-ci/managers/debian.sh CONFLICT (add/add): Merge conflict in travis-ci/managers/debian.sh Auto-merging tools/xml_helper.py CONFLICT (add/add): Merge conflict in tools/xml_helper.py Auto-merging tools/update-man-rules.py CONFLICT (add/add): Merge conflict in tools/update-man-rules.py Auto-merging tools/update-dbus-docs.py CONFLICT (add/add): Merge conflict in tools/update-dbus-docs.py Auto-merging tools/oss-fuzz.sh CONFLICT (add/add): Merge conflict in tools/oss-fuzz.sh Auto-merging tools/make-man-index.py CONFLICT (add/add): Merge conflict in tools/make-man-index.py Auto-merging tools/make-directive-index.py CONFLICT (add/add): Merge conflict in tools/make-directive-index.py Auto-merging tools/make-autosuspend-rules.py CONFLICT (add/add): Merge conflict in tools/make-autosuspend-rules.py Auto-merging tools/git-contrib.sh CONFLICT (add/add): Merge conflict in tools/git-contrib.sh Auto-merging tools/generate-gperfs.py CONFLICT (add/add): Merge conflict in tools/generate-gperfs.py Auto-merging tools/gdb-sd_dump_hashmaps.py CONFLICT (add/add): Merge conflict in tools/gdb-sd_dump_hashmaps.py Auto-merging tools/find-tabs.sh CONFLICT (add/add): Merge conflict in tools/find-tabs.sh Auto-merging tools/find-double-newline.sh CONFLICT (add/add): Merge conflict in tools/find-double-newline.sh Auto-merging tools/chromiumos/gen_autosuspend_rules.py CONFLICT (add/add): Merge conflict in tools/chromiumos/gen_autosuspend_rules.py Auto-merging tmpfiles.d/tmp.conf CONFLICT (add/add): Merge conflict in tmpfiles.d/tmp.conf Auto-merging tmpfiles.d/systemd-pstore.conf CONFLICT (add/add): Merge conflict in tmpfiles.d/systemd-pstore.conf Auto-merging tmpfiles.d/portables.conf CONFLICT (add/add): Merge conflict in tmpfiles.d/portables.conf Auto-merging tmpfiles.d/meson.build CONFLICT (add/add): Merge conflict in tmpfiles.d/meson.build Auto-merging tmpfiles.d/legacy.conf CONFLICT (add/add): Merge conflict in tmpfiles.d/legacy.conf Auto-merging test/units/timers.target CONFLICT (add/add): Merge conflict in test/units/timers.target Auto-merging test/units/testsuite-48.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-48.sh Auto-merging test/units/testsuite-47.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-47.sh Auto-merging test/units/testsuite-38.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-38.sh Auto-merging test/units/testsuite-36.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-36.sh Auto-merging test/units/testsuite-29.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-29.sh Auto-merging test/units/testsuite-24.service CONFLICT (add/add): Merge conflict in test/units/testsuite-24.service Auto-merging test/units/testsuite-16.service CONFLICT (add/add): Merge conflict in test/units/testsuite-16.service Auto-merging test/units/testsuite-13.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-13.sh Auto-merging test/units/testsuite-02.service CONFLICT (add/add): Merge conflict in test/units/testsuite-02.service Auto-merging test/units/sysinit.target CONFLICT (add/add): Merge conflict in test/units/sysinit.target Auto-merging test/units/sockets.target CONFLICT (add/add): Merge conflict in test/units/sockets.target Auto-merging test/units/shutdown.target CONFLICT (add/add): Merge conflict in test/units/shutdown.target Auto-merging test/units/basic.target CONFLICT (add/add): Merge conflict in test/units/basic.target Auto-merging test/udev-test.pl CONFLICT (add/add): Merge conflict in test/udev-test.pl Auto-merging test/testsuite-11.units/fail-on-restart.service CONFLICT (add/add): Merge conflict in test/testsuite-11.units/fail-on-restart.service Auto-merging test/testsuite-04.units/forever-print-hola.service CONFLICT (add/add): Merge conflict in test/testsuite-04.units/forever-print-hola.service Auto-merging test/test-path/sysinit.target CONFLICT (add/add): Merge conflict in test/test-path/sysinit.target Auto-merging test/test-path/paths.target CONFLICT (add/add): Merge conflict in test/test-path/paths.target Auto-merging test/test-path/path-mycustomunit.service CONFLICT (add/add): Merge conflict in test/test-path/path-mycustomunit.service Auto-merging test/test-path/path-modified.service CONFLICT (add/add): Merge conflict in test/test-path/path-modified.service Auto-merging test/test-path/path-makedirectory.service CONFLICT (add/add): Merge conflict in test/test-path/path-makedirectory.service Auto-merging test/test-path/path-existsglob.service CONFLICT (add/add): Merge conflict in test/test-path/path-existsglob.service Auto-merging test/test-path/path-exists.service CONFLICT (add/add): Merge conflict in test/test-path/path-exists.service Auto-merging test/test-path/path-directorynotempty.service CONFLICT (add/add): Merge conflict in test/test-path/path-directorynotempty.service Auto-merging test/test-path/path-changed.service CONFLICT (add/add): Merge conflict in test/test-path/path-changed.service Auto-merging test/test-path/basic.target CONFLICT (add/add): Merge conflict in test/test-path/basic.target Auto-merging test/test-network/systemd-networkd-tests.py CONFLICT (add/add): Merge conflict in test/test-network/systemd-networkd-tests.py Auto-merging test/test-network/conf/vti6.network CONFLICT (add/add): Merge conflict in test/test-network/conf/vti6.network Auto-merging test/test-network/conf/vti.network CONFLICT (add/add): Merge conflict in test/test-network/conf/vti.network Auto-merging test/test-network/conf/state-file-tests.network CONFLICT (add/add): Merge conflict in test/test-network/conf/state-file-tests.network Auto-merging test/test-network/conf/sit.network CONFLICT (add/add): Merge conflict in test/test-network/conf/sit.network Auto-merging test/test-network/conf/routing-policy-rule-test1.network CONFLICT (add/add): Merge conflict in test/test-network/conf/routing-policy-rule-test1.network Auto-merging test/test-network/conf/routing-policy-rule-dummy98.network CONFLICT (add/add): Merge conflict in test/test-network/conf/routing-policy-rule-dummy98.network Auto-merging test/test-network/conf/netdev-link-local-addressing-yes.network CONFLICT (add/add): Merge conflict in test/test-network/conf/netdev-link-local-addressing-yes.network Auto-merging test/test-network/conf/macvtap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/macvtap.network Auto-merging test/test-network/conf/macvlan.network CONFLICT (add/add): Merge conflict in test/test-network/conf/macvlan.network Auto-merging test/test-network/conf/isatap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/isatap.network Auto-merging test/test-network/conf/ipvtap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipvtap.network Auto-merging test/test-network/conf/ipvlan.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipvlan.network Auto-merging test/test-network/conf/ipv6ra-prefix.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipv6ra-prefix.network Auto-merging test/test-network/conf/ipv6-prefix.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipv6-prefix.network Auto-merging test/test-network/conf/ipv6-prefix-veth.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipv6-prefix-veth.network Auto-merging test/test-network/conf/ipv6-prefix-veth-token-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipv6-prefix-veth-token-static.network Auto-merging test/test-network/conf/ipip.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipip.network Auto-merging test/test-network/conf/ip6tnl.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ip6tnl.network Auto-merging test/test-network/conf/ip6gretun.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ip6gretun.network Auto-merging test/test-network/conf/ip6gretap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ip6gretap.network Auto-merging test/test-network/conf/gretun.network CONFLICT (add/add): Merge conflict in test/test-network/conf/gretun.network Auto-merging test/test-network/conf/gretap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/gretap.network Auto-merging test/test-network/conf/erspan.network CONFLICT (add/add): Merge conflict in test/test-network/conf/erspan.network Auto-merging test/test-network/conf/dhcp-client-gateway-ipv6.network CONFLICT (add/add): Merge conflict in test/test-network/conf/dhcp-client-gateway-ipv6.network Auto-merging test/test-network/conf/dhcp-client-gateway-ipv4.network CONFLICT (add/add): Merge conflict in test/test-network/conf/dhcp-client-gateway-ipv4.network Auto-merging test/test-network/conf/6rd.network CONFLICT (add/add): Merge conflict in test/test-network/conf/6rd.network Auto-merging test/test-network/conf/25-vrf.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-vrf.network Auto-merging test/test-network/conf/25-sysctl.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-sysctl.network Auto-merging test/test-network/conf/25-route-vrf.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-route-vrf.network Auto-merging test/test-network/conf/25-route-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-route-static.network Auto-merging test/test-network/conf/25-qdisc-qfq.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-qdisc-qfq.network Auto-merging test/test-network/conf/25-qdisc-drr.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-qdisc-drr.network Auto-merging test/test-network/conf/25-qdisc-clsact-and-htb.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-qdisc-clsact-and-htb.network Auto-merging test/test-network/conf/25-qdisc-cake.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-qdisc-cake.network Auto-merging test/test-network/conf/25-ipv6-address-label-section.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-ipv6-address-label-section.network Auto-merging test/test-network/conf/25-gateway-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-gateway-static.network Auto-merging test/test-network/conf/25-gateway-next-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-gateway-next-static.network Auto-merging test/test-network/conf/25-fibrule-uidrange.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-fibrule-uidrange.network Auto-merging test/test-network/conf/25-fibrule-port-range.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-fibrule-port-range.network Auto-merging test/test-network/conf/25-fibrule-invert.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-fibrule-invert.network Auto-merging test/test-network/conf/25-address-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-address-static.network Auto-merging test/test-network/conf/25-address-preferred-lifetime-zero.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-address-preferred-lifetime-zero.network Auto-merging test/test-network/conf/25-address-link-section.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-address-link-section.network Auto-merging test/test-network/conf/24-search-domain.network CONFLICT (add/add): Merge conflict in test/test-network/conf/24-search-domain.network Auto-merging test/test-network/conf/24-lldp.network CONFLICT (add/add): Merge conflict in test/test-network/conf/24-lldp.network Auto-merging test/test-network/conf/24-keep-configuration-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/24-keep-configuration-static.network Auto-merging test/test-network/conf/23-emit-lldp.network CONFLICT (add/add): Merge conflict in test/test-network/conf/23-emit-lldp.network Auto-merging test/test-network/conf/23-bond199.network CONFLICT (add/add): Merge conflict in test/test-network/conf/23-bond199.network Auto-merging test/test-network-generator-conversion.sh CONFLICT (add/add): Merge conflict in test/test-network-generator-conversion.sh Auto-merging test/test-functions CONFLICT (add/add): Merge conflict in test/test-functions Auto-merging test/test-execute/exec-dynamicuser-statedir.service CONFLICT (add/add): Merge conflict in test/test-execute/exec-dynamicuser-statedir.service Auto-merging test/test-exec-deserialization.py CONFLICT (add/add): Merge conflict in test/test-exec-deserialization.py Auto-merging test/sysv-generator-test.py CONFLICT (add/add): Merge conflict in test/sysv-generator-test.py Auto-merging test/sys-script.py CONFLICT (add/add): Merge conflict in test/sys-script.py Auto-merging test/run-integration-tests.sh CONFLICT (add/add): Merge conflict in test/run-integration-tests.sh Auto-merging test/rule-syntax-check.py CONFLICT (add/add): Merge conflict in test/rule-syntax-check.py Auto-merging test/networkd-test.py CONFLICT (add/add): Merge conflict in test/networkd-test.py Auto-merging test/mkosi.default.networkd-test CONFLICT (add/add): Merge conflict in test/mkosi.default.networkd-test Auto-merging test/meson.build CONFLICT (add/add): Merge conflict in test/meson.build Auto-merging test/hwdb-test.sh CONFLICT (add/add): Merge conflict in test/hwdb-test.sh Auto-merging test/fuzz/meson.build CONFLICT (add/add): Merge conflict in test/fuzz/meson.build Auto-merging test/fuzz/fuzz-unit-file/var-lib-machines.mount CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/var-lib-machines.mount Auto-merging test/fuzz/fuzz-unit-file/timers.target CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/timers.target Auto-merging test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer Auto-merging test/fuzz/fuzz-unit-file/systemd-resolved.service CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/systemd-resolved.service Auto-merging test/fuzz/fuzz-unit-file/systemd-machined.service CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/systemd-machined.service Auto-merging test/fuzz/fuzz-unit-file/systemd-ask-password-console.path CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/systemd-ask-password-console.path Auto-merging test/fuzz/fuzz-unit-file/syslog.socket CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/syslog.socket Auto-merging test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount Auto-merging test/fuzz/fuzz-unit-file/machine.slice CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/machine.slice Auto-merging test/fuzz/fuzz-unit-file/directives.service CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/directives.service Auto-merging test/fuzz/fuzz-udev-rules/99-systemd.rules CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-udev-rules/99-systemd.rules Auto-merging test/fuzz/fuzz-network-parser/oss-fuzz-15678 CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-network-parser/oss-fuzz-15678 Auto-merging test/fuzz/fuzz-network-parser/directives.network CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-network-parser/directives.network Auto-merging test/fuzz/fuzz-netdev-parser/directives.netdev CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-netdev-parser/directives.netdev Auto-merging test/fuzz/fuzz-link-parser/99-default.link CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-link-parser/99-default.link Auto-merging test/fuzz/fuzz-catalog/systemd.pl.catalog CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-catalog/systemd.pl.catalog Auto-merging test/create-sys-script.py CONFLICT (add/add): Merge conflict in test/create-sys-script.py Auto-merging test/create-busybox-container CONFLICT (add/add): Merge conflict in test/create-busybox-container Auto-merging test/TEST-36-NUMAPOLICY/test.sh CONFLICT (add/add): Merge conflict in test/TEST-36-NUMAPOLICY/test.sh Auto-merging test/TEST-29-UDEV-ID_RENAMING/test.sh CONFLICT (add/add): Merge conflict in test/TEST-29-UDEV-ID_RENAMING/test.sh Auto-merging test/TEST-13-NSPAWN-SMOKE/test.sh CONFLICT (add/add): Merge conflict in test/TEST-13-NSPAWN-SMOKE/test.sh Auto-merging test/README.testsuite CONFLICT (add/add): Merge conflict in test/README.testsuite Auto-merging sysusers.d/systemd.conf.m4 CONFLICT (add/add): Merge conflict in sysusers.d/systemd.conf.m4 Auto-merging sysusers.d/meson.build CONFLICT (add/add): Merge conflict in sysusers.d/meson.build Auto-merging sysctl.d/meson.build CONFLICT (add/add): Merge conflict in sysctl.d/meson.build Auto-merging sysctl.d/50-default.conf CONFLICT (add/add): Merge conflict in sysctl.d/50-default.conf Auto-merging sysctl.d/50-coredump.conf.in CONFLICT (add/add): Merge conflict in sysctl.d/50-coredump.conf.in Auto-merging src/xdg-autostart-generator/xdg-autostart-service.h CONFLICT (add/add): Merge conflict in src/xdg-autostart-generator/xdg-autostart-service.h Auto-merging src/xdg-autostart-generator/xdg-autostart-service.c CONFLICT (add/add): Merge conflict in src/xdg-autostart-generator/xdg-autostart-service.c Auto-merging src/xdg-autostart-generator/xdg-autostart-generator.c CONFLICT (add/add): Merge conflict in src/xdg-autostart-generator/xdg-autostart-generator.c Auto-merging src/xdg-autostart-generator/xdg-autostart-condition.c CONFLICT (add/add): Merge conflict in src/xdg-autostart-generator/xdg-autostart-condition.c Auto-merging src/volatile-root/volatile-root.c CONFLICT (add/add): Merge conflict in src/volatile-root/volatile-root.c Auto-merging src/veritysetup/veritysetup.c CONFLICT (add/add): Merge conflict in src/veritysetup/veritysetup.c Auto-merging src/veritysetup/veritysetup-generator.c CONFLICT (add/add): Merge conflict in src/veritysetup/veritysetup-generator.c Auto-merging src/vconsole/vconsole-setup.c CONFLICT (add/add): Merge conflict in src/vconsole/vconsole-setup.c Auto-merging src/vconsole/meson.build CONFLICT (add/add): Merge conflict in src/vconsole/meson.build Auto-merging src/vconsole/90-vconsole.rules.in CONFLICT (add/add): Merge conflict in src/vconsole/90-vconsole.rules.in Auto-merging src/userdb/userwork.c CONFLICT (add/add): Merge conflict in src/userdb/userwork.c Auto-merging src/userdb/userdbd.c CONFLICT (add/add): Merge conflict in src/userdb/userdbd.c Auto-merging src/userdb/userdbd-manager.h CONFLICT (add/add): Merge conflict in src/userdb/userdbd-manager.h Auto-merging src/userdb/userdbd-manager.c CONFLICT (add/add): Merge conflict in src/userdb/userdbd-manager.c Auto-merging src/userdb/userdbctl.c CONFLICT (add/add): Merge conflict in src/userdb/userdbctl.c Auto-merging src/userdb/meson.build CONFLICT (add/add): Merge conflict in src/userdb/meson.build Auto-merging src/user-sessions/user-sessions.c CONFLICT (add/add): Merge conflict in src/user-sessions/user-sessions.c Auto-merging src/update-utmp/update-utmp.c CONFLICT (add/add): Merge conflict in src/update-utmp/update-utmp.c Auto-merging src/update-done/update-done.c CONFLICT (add/add): Merge conflict in src/update-done/update-done.c Auto-merging src/udev/v4l_id/v4l_id.c CONFLICT (add/add): Merge conflict in src/udev/v4l_id/v4l_id.c Auto-merging src/udev/udevd.h CONFLICT (add/add): Merge conflict in src/udev/udevd.h Auto-merging src/udev/udevd.c CONFLICT (add/add): Merge conflict in src/udev/udevd.c Auto-merging src/udev/udevadm.h CONFLICT (add/add): Merge conflict in src/udev/udevadm.h Auto-merging src/udev/udevadm.c CONFLICT (add/add): Merge conflict in src/udev/udevadm.c Auto-merging src/udev/udevadm-util.h CONFLICT (add/add): Merge conflict in src/udev/udevadm-util.h Auto-merging src/udev/udevadm-util.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-util.c Auto-merging src/udev/udevadm-trigger.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-trigger.c Auto-merging src/udev/udevadm-test.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-test.c Auto-merging src/udev/udevadm-test-builtin.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-test-builtin.c Auto-merging src/udev/udevadm-settle.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-settle.c Auto-merging src/udev/udevadm-monitor.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-monitor.c Auto-merging src/udev/udevadm-info.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-info.c Auto-merging src/udev/udevadm-hwdb.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-hwdb.c Auto-merging src/udev/udevadm-control.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-control.c Auto-merging src/udev/udev.conf CONFLICT (add/add): Merge conflict in src/udev/udev.conf Auto-merging src/udev/udev-watch.h CONFLICT (add/add): Merge conflict in src/udev/udev-watch.h Auto-merging src/udev/udev-watch.c CONFLICT (add/add): Merge conflict in src/udev/udev-watch.c Auto-merging src/udev/udev-rules.h CONFLICT (add/add): Merge conflict in src/udev/udev-rules.h Auto-merging src/udev/udev-rules.c CONFLICT (add/add): Merge conflict in src/udev/udev-rules.c Auto-merging src/udev/udev-node.h CONFLICT (add/add): Merge conflict in src/udev/udev-node.h Auto-merging src/udev/udev-node.c CONFLICT (add/add): Merge conflict in src/udev/udev-node.c Auto-merging src/udev/udev-event.h CONFLICT (add/add): Merge conflict in src/udev/udev-event.h Auto-merging src/udev/udev-event.c CONFLICT (add/add): Merge conflict in src/udev/udev-event.c Auto-merging src/udev/udev-ctrl.h CONFLICT (add/add): Merge conflict in src/udev/udev-ctrl.h Auto-merging src/udev/udev-ctrl.c CONFLICT (add/add): Merge conflict in src/udev/udev-ctrl.c Auto-merging src/udev/udev-builtin.h CONFLICT (add/add): Merge conflict in src/udev/udev-builtin.h Auto-merging src/udev/udev-builtin.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin.c Auto-merging src/udev/udev-builtin-usb_id.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-usb_id.c Auto-merging src/udev/udev-builtin-uaccess.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-uaccess.c Auto-merging src/udev/udev-builtin-path_id.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-path_id.c Auto-merging src/udev/udev-builtin-net_setup_link.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-net_setup_link.c Auto-merging src/udev/udev-builtin-net_id.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-net_id.c Auto-merging src/udev/udev-builtin-kmod.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-kmod.c Auto-merging src/udev/udev-builtin-keyboard.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-keyboard.c Auto-merging src/udev/udev-builtin-input_id.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-input_id.c Auto-merging src/udev/udev-builtin-hwdb.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-hwdb.c Auto-merging src/udev/udev-builtin-btrfs.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-btrfs.c Auto-merging src/udev/udev-builtin-blkid.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-blkid.c Auto-merging src/udev/scsi_id/scsi_serial.c CONFLICT (add/add): Merge conflict in src/udev/scsi_id/scsi_serial.c Auto-merging src/udev/scsi_id/scsi_id.h CONFLICT (add/add): Merge conflict in src/udev/scsi_id/scsi_id.h Auto-merging src/udev/scsi_id/scsi_id.c CONFLICT (add/add): Merge conflict in src/udev/scsi_id/scsi_id.c Auto-merging src/udev/scsi_id/scsi.h CONFLICT (add/add): Merge conflict in src/udev/scsi_id/scsi.h Auto-merging src/udev/net/link-config.h CONFLICT (add/add): Merge conflict in src/udev/net/link-config.h Auto-merging src/udev/net/link-config.c CONFLICT (add/add): Merge conflict in src/udev/net/link-config.c Auto-merging src/udev/net/link-config-gperf.gperf CONFLICT (add/add): Merge conflict in src/udev/net/link-config-gperf.gperf Auto-merging src/udev/net/fuzz-link-parser.c CONFLICT (add/add): Merge conflict in src/udev/net/fuzz-link-parser.c Auto-merging src/udev/mtd_probe/probe_smartmedia.c CONFLICT (add/add): Merge conflict in src/udev/mtd_probe/probe_smartmedia.c Auto-merging src/udev/mtd_probe/mtd_probe.h CONFLICT (add/add): Merge conflict in src/udev/mtd_probe/mtd_probe.h Auto-merging src/udev/mtd_probe/mtd_probe.c CONFLICT (add/add): Merge conflict in src/udev/mtd_probe/mtd_probe.c Auto-merging src/udev/meson.build CONFLICT (add/add): Merge conflict in src/udev/meson.build Auto-merging src/udev/fido_id/test-fido-id-desc.c CONFLICT (add/add): Merge conflict in src/udev/fido_id/test-fido-id-desc.c Auto-merging src/udev/fido_id/fuzz-fido-id-desc.c CONFLICT (add/add): Merge conflict in src/udev/fido_id/fuzz-fido-id-desc.c Auto-merging src/udev/fido_id/fido_id_desc.h CONFLICT (add/add): Merge conflict in src/udev/fido_id/fido_id_desc.h Auto-merging src/udev/fido_id/fido_id_desc.c CONFLICT (add/add): Merge conflict in src/udev/fido_id/fido_id_desc.c Auto-merging src/udev/fido_id/fido_id.c CONFLICT (add/add): Merge conflict in src/udev/fido_id/fido_id.c Auto-merging src/udev/cdrom_id/cdrom_id.c CONFLICT (add/add): Merge conflict in src/udev/cdrom_id/cdrom_id.c Auto-merging src/udev/ata_id/ata_id.c CONFLICT (add/add): Merge conflict in src/udev/ata_id/ata_id.c Auto-merging src/tty-ask-password-agent/tty-ask-password-agent.c CONFLICT (add/add): Merge conflict in src/tty-ask-password-agent/tty-ask-password-agent.c Auto-merging src/tmpfiles/tmpfiles.c CONFLICT (add/add): Merge conflict in src/tmpfiles/tmpfiles.c Auto-merging src/timesync/timesyncd.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd.c Auto-merging src/timesync/timesyncd-server.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-server.h Auto-merging src/timesync/timesyncd-server.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-server.c Auto-merging src/timesync/timesyncd-ntp-message.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-ntp-message.h Auto-merging src/timesync/timesyncd-manager.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-manager.h Auto-merging src/timesync/timesyncd-manager.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-manager.c Auto-merging src/timesync/timesyncd-conf.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-conf.h Auto-merging src/timesync/timesyncd-conf.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-conf.c Auto-merging src/timesync/timesyncd-bus.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-bus.h Auto-merging src/timesync/timesyncd-bus.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-bus.c Auto-merging src/timesync/test-timesync.c CONFLICT (add/add): Merge conflict in src/timesync/test-timesync.c Auto-merging src/timesync/org.freedesktop.timesync1.service CONFLICT (add/add): Merge conflict in src/timesync/org.freedesktop.timesync1.service Auto-merging src/timesync/meson.build CONFLICT (add/add): Merge conflict in src/timesync/meson.build Auto-merging src/timedate/timedated.c CONFLICT (add/add): Merge conflict in src/timedate/timedated.c Auto-merging src/timedate/timedatectl.c CONFLICT (add/add): Merge conflict in src/timedate/timedatectl.c Auto-merging src/timedate/org.freedesktop.timedate1.service CONFLICT (add/add): Merge conflict in src/timedate/org.freedesktop.timedate1.service Auto-merging src/timedate/org.freedesktop.timedate1.policy CONFLICT (add/add): Merge conflict in src/timedate/org.freedesktop.timedate1.policy Auto-merging src/timedate/org.freedesktop.timedate1.conf CONFLICT (add/add): Merge conflict in src/timedate/org.freedesktop.timedate1.conf Auto-merging src/timedate/meson.build CONFLICT (add/add): Merge conflict in src/timedate/meson.build Auto-merging src/time-wait-sync/time-wait-sync.c CONFLICT (add/add): Merge conflict in src/time-wait-sync/time-wait-sync.c Auto-merging src/test/test-xml.c CONFLICT (add/add): Merge conflict in src/test/test-xml.c Auto-merging src/test/test-xdg-autostart.c CONFLICT (add/add): Merge conflict in src/test/test-xdg-autostart.c Auto-merging src/test/test-xattr-util.c CONFLICT (add/add): Merge conflict in src/test/test-xattr-util.c Auto-merging src/test/test-web-util.c CONFLICT (add/add): Merge conflict in src/test/test-web-util.c Auto-merging src/test/test-watchdog.c CONFLICT (add/add): Merge conflict in src/test/test-watchdog.c Auto-merging src/test/test-watch-pid.c CONFLICT (add/add): Merge conflict in src/test/test-watch-pid.c Auto-merging src/test/test-verbs.c CONFLICT (add/add): Merge conflict in src/test/test-verbs.c Auto-merging src/test/test-varlink.c CONFLICT (add/add): Merge conflict in src/test/test-varlink.c Auto-merging src/test/test-util.c CONFLICT (add/add): Merge conflict in src/test/test-util.c Auto-merging src/test/test-utf8.c CONFLICT (add/add): Merge conflict in src/test/test-utf8.c Auto-merging src/test/test-user-util.c CONFLICT (add/add): Merge conflict in src/test/test-user-util.c Auto-merging src/test/test-unit-name.c CONFLICT (add/add): Merge conflict in src/test/test-unit-name.c Auto-merging src/test/test-unit-file.c CONFLICT (add/add): Merge conflict in src/test/test-unit-file.c Auto-merging src/test/test-unaligned.c CONFLICT (add/add): Merge conflict in src/test/test-unaligned.c Auto-merging src/test/test-umount.c CONFLICT (add/add): Merge conflict in src/test/test-umount.c Auto-merging src/test/test-umask-util.c CONFLICT (add/add): Merge conflict in src/test/test-umask-util.c Auto-merging src/test/test-uid-range.c CONFLICT (add/add): Merge conflict in src/test/test-uid-range.c Auto-merging src/test/test-udev.c CONFLICT (add/add): Merge conflict in src/test/test-udev.c Auto-merging src/test/test-tmpfiles.c CONFLICT (add/add): Merge conflict in src/test/test-tmpfiles.c Auto-merging src/test/test-time-util.c CONFLICT (add/add): Merge conflict in src/test/test-time-util.c Auto-merging src/test/test-terminal-util.c CONFLICT (add/add): Merge conflict in src/test/test-terminal-util.c Auto-merging src/test/test-tables.c CONFLICT (add/add): Merge conflict in src/test/test-tables.c Auto-merging src/test/test-systemd-tmpfiles.py CONFLICT (add/add): Merge conflict in src/test/test-systemd-tmpfiles.py Auto-merging src/test/test-sysctl-util.c CONFLICT (add/add): Merge conflict in src/test/test-sysctl-util.c Auto-merging src/test/test-strxcpyx.c CONFLICT (add/add): Merge conflict in src/test/test-strxcpyx.c Auto-merging src/test/test-strv.c CONFLICT (add/add): Merge conflict in src/test/test-strv.c Auto-merging src/test/test-strip-tab-ansi.c CONFLICT (add/add): Merge conflict in src/test/test-strip-tab-ansi.c Auto-merging src/test/test-string-util.c CONFLICT (add/add): Merge conflict in src/test/test-string-util.c Auto-merging src/test/test-strbuf.c CONFLICT (add/add): Merge conflict in src/test/test-strbuf.c Auto-merging src/test/test-static-destruct.c CONFLICT (add/add): Merge conflict in src/test/test-static-destruct.c Auto-merging src/test/test-stat-util.c CONFLICT (add/add): Merge conflict in src/test/test-stat-util.c Auto-merging src/test/test-specifier.c CONFLICT (add/add): Merge conflict in src/test/test-specifier.c Auto-merging src/test/test-socket-util.c CONFLICT (add/add): Merge conflict in src/test/test-socket-util.c Auto-merging src/test/test-socket-netlink.c CONFLICT (add/add): Merge conflict in src/test/test-socket-netlink.c Auto-merging src/test/test-sleep.c CONFLICT (add/add): Merge conflict in src/test/test-sleep.c Auto-merging src/test/test-sizeof.c CONFLICT (add/add): Merge conflict in src/test/test-sizeof.c Auto-merging src/test/test-siphash24.c CONFLICT (add/add): Merge conflict in src/test/test-siphash24.c Auto-merging src/test/test-signal-util.c CONFLICT (add/add): Merge conflict in src/test/test-signal-util.c Auto-merging src/test/test-sigbus.c CONFLICT (add/add): Merge conflict in src/test/test-sigbus.c Auto-merging src/test/test-set.c CONFLICT (add/add): Merge conflict in src/test/test-set.c Auto-merging src/test/test-set-disable-mempool.c CONFLICT (add/add): Merge conflict in src/test/test-set-disable-mempool.c Auto-merging src/test/test-serialize.c CONFLICT (add/add): Merge conflict in src/test/test-serialize.c Auto-merging src/test/test-selinux.c CONFLICT (add/add): Merge conflict in src/test/test-selinux.c Auto-merging src/test/test-seccomp.c CONFLICT (add/add): Merge conflict in src/test/test-seccomp.c Auto-merging src/test/test-sd-path.c CONFLICT (add/add): Merge conflict in src/test/test-sd-path.c Auto-merging src/test/test-sd-hwdb.c CONFLICT (add/add): Merge conflict in src/test/test-sd-hwdb.c Auto-merging src/test/test-sched-prio.c CONFLICT (add/add): Merge conflict in src/test/test-sched-prio.c Auto-merging src/test/test-rlimit-util.c CONFLICT (add/add): Merge conflict in src/test/test-rlimit-util.c Auto-merging src/test/test-replace-var.c CONFLICT (add/add): Merge conflict in src/test/test-replace-var.c Auto-merging src/test/test-ratelimit.c CONFLICT (add/add): Merge conflict in src/test/test-ratelimit.c Auto-merging src/test/test-random-util.c CONFLICT (add/add): Merge conflict in src/test/test-random-util.c Auto-merging src/test/test-procfs-util.c CONFLICT (add/add): Merge conflict in src/test/test-procfs-util.c Auto-merging src/test/test-process-util.c CONFLICT (add/add): Merge conflict in src/test/test-process-util.c Auto-merging src/test/test-proc-cmdline.c CONFLICT (add/add): Merge conflict in src/test/test-proc-cmdline.c Auto-merging src/test/test-prioq.c CONFLICT (add/add): Merge conflict in src/test/test-prioq.c Auto-merging src/test/test-pretty-print.c CONFLICT (add/add): Merge conflict in src/test/test-pretty-print.c Auto-merging src/test/test-path.c CONFLICT (add/add): Merge conflict in src/test/test-path.c Auto-merging src/test/test-path-util.c CONFLICT (add/add): Merge conflict in src/test/test-path-util.c Auto-merging src/test/test-path-lookup.c CONFLICT (add/add): Merge conflict in src/test/test-path-lookup.c Auto-merging src/test/test-parse-util.c CONFLICT (add/add): Merge conflict in src/test/test-parse-util.c Auto-merging src/test/test-os-util.c CONFLICT (add/add): Merge conflict in src/test/test-os-util.c Auto-merging src/test/test-ordered-set.c CONFLICT (add/add): Merge conflict in src/test/test-ordered-set.c Auto-merging src/test/test-nss.c CONFLICT (add/add): Merge conflict in src/test/test-nss.c Auto-merging src/test/test-nscd-flush.c CONFLICT (add/add): Merge conflict in src/test/test-nscd-flush.c Auto-merging src/test/test-ns.c CONFLICT (add/add): Merge conflict in src/test/test-ns.c Auto-merging src/test/test-netlink-manual.c CONFLICT (add/add): Merge conflict in src/test/test-netlink-manual.c Auto-merging src/test/test-namespace.c CONFLICT (add/add): Merge conflict in src/test/test-namespace.c Auto-merging src/test/test-mountpoint-util.c CONFLICT (add/add): Merge conflict in src/test/test-mountpoint-util.c Auto-merging src/test/test-mount-util.c CONFLICT (add/add): Merge conflict in src/test/test-mount-util.c Auto-merging src/test/test-loopback.c CONFLICT (add/add): Merge conflict in src/test/test-loopback.c Auto-merging src/test/test-log.c CONFLICT (add/add): Merge conflict in src/test/test-log.c Auto-merging src/test/test-locale-util.c CONFLICT (add/add): Merge conflict in src/test/test-locale-util.c Auto-merging src/test/test-local-addresses.c CONFLICT (add/add): Merge conflict in src/test/test-local-addresses.c Auto-merging src/test/test-load-fragment.c CONFLICT (add/add): Merge conflict in src/test/test-load-fragment.c Auto-merging src/test/test-list.c CONFLICT (add/add): Merge conflict in src/test/test-list.c Auto-merging src/test/test-libudev.c CONFLICT (add/add): Merge conflict in src/test/test-libudev.c Auto-merging src/test/test-libmount.c CONFLICT (add/add): Merge conflict in src/test/test-libmount.c Auto-merging src/test/test-json.c CONFLICT (add/add): Merge conflict in src/test/test-json.c Auto-merging src/test/test-journal-importer.c CONFLICT (add/add): Merge conflict in src/test/test-journal-importer.c Auto-merging src/test/test-job-type.c CONFLICT (add/add): Merge conflict in src/test/test-job-type.c Auto-merging src/test/test-ipcrm.c CONFLICT (add/add): Merge conflict in src/test/test-ipcrm.c Auto-merging src/test/test-ip-protocol-list.c CONFLICT (add/add): Merge conflict in src/test/test-ip-protocol-list.c Auto-merging src/test/test-io-util.c CONFLICT (add/add): Merge conflict in src/test/test-io-util.c Auto-merging src/test/test-install.c CONFLICT (add/add): Merge conflict in src/test/test-install.c Auto-merging src/test/test-install-root.c CONFLICT (add/add): Merge conflict in src/test/test-install-root.c Auto-merging src/test/test-in-addr-util.c CONFLICT (add/add): Merge conflict in src/test/test-in-addr-util.c Auto-merging src/test/test-id128.c CONFLICT (add/add): Merge conflict in src/test/test-id128.c Auto-merging src/test/test-hostname.c CONFLICT (add/add): Merge conflict in src/test/test-hostname.c Auto-merging src/test/test-hostname-util.c CONFLICT (add/add): Merge conflict in src/test/test-hostname-util.c Auto-merging src/test/test-hexdecoct.c CONFLICT (add/add): Merge conflict in src/test/test-hexdecoct.c Auto-merging src/test/test-hashmap.c CONFLICT (add/add): Merge conflict in src/test/test-hashmap.c Auto-merging src/test/test-hashmap-plain.c CONFLICT (add/add): Merge conflict in src/test/test-hashmap-plain.c Auto-merging src/test/test-hash.c CONFLICT (add/add): Merge conflict in src/test/test-hash.c Auto-merging src/test/test-glob-util.c CONFLICT (add/add): Merge conflict in src/test/test-glob-util.c Auto-merging src/test/test-gcrypt-util.c CONFLICT (add/add): Merge conflict in src/test/test-gcrypt-util.c Auto-merging src/test/test-fstab-util.c CONFLICT (add/add): Merge conflict in src/test/test-fstab-util.c Auto-merging src/test/test-fs-util.c CONFLICT (add/add): Merge conflict in src/test/test-fs-util.c Auto-merging src/test/test-format-util.c CONFLICT (add/add): Merge conflict in src/test/test-format-util.c Auto-merging src/test/test-format-table.c CONFLICT (add/add): Merge conflict in src/test/test-format-table.c Auto-merging src/test/test-firewall-util.c CONFLICT (add/add): Merge conflict in src/test/test-firewall-util.c Auto-merging src/test/test-fileio.c CONFLICT (add/add): Merge conflict in src/test/test-fileio.c Auto-merging src/test/test-fdset.c CONFLICT (add/add): Merge conflict in src/test/test-fdset.c Auto-merging src/test/test-fd-util.c CONFLICT (add/add): Merge conflict in src/test/test-fd-util.c Auto-merging src/test/test-extract-word.c CONFLICT (add/add): Merge conflict in src/test/test-extract-word.c Auto-merging src/test/test-exit-status.c CONFLICT (add/add): Merge conflict in src/test/test-exit-status.c Auto-merging src/test/test-execute.c CONFLICT (add/add): Merge conflict in src/test/test-execute.c Auto-merging src/test/test-exec-util.c CONFLICT (add/add): Merge conflict in src/test/test-exec-util.c Auto-merging src/test/test-escape.c CONFLICT (add/add): Merge conflict in src/test/test-escape.c Auto-merging src/test/test-env-util.c CONFLICT (add/add): Merge conflict in src/test/test-env-util.c Auto-merging src/test/test-env-file.c CONFLICT (add/add): Merge conflict in src/test/test-env-file.c Auto-merging src/test/test-engine.c CONFLICT (add/add): Merge conflict in src/test/test-engine.c Auto-merging src/test/test-emergency-action.c CONFLICT (add/add): Merge conflict in src/test/test-emergency-action.c Auto-merging src/test/test-ellipsize.c CONFLICT (add/add): Merge conflict in src/test/test-ellipsize.c Auto-merging src/test/test-dns-domain.c CONFLICT (add/add): Merge conflict in src/test/test-dns-domain.c Auto-merging src/test/test-dlopen.c CONFLICT (add/add): Merge conflict in src/test/test-dlopen.c Auto-merging src/test/test-device-nodes.c CONFLICT (add/add): Merge conflict in src/test/test-device-nodes.c Auto-merging src/test/test-dev-setup.c CONFLICT (add/add): Merge conflict in src/test/test-dev-setup.c Auto-merging src/test/test-date.c CONFLICT (add/add): Merge conflict in src/test/test-date.c Auto-merging src/test/test-daemon.c CONFLICT (add/add): Merge conflict in src/test/test-daemon.c Auto-merging src/test/test-cpu-set-util.c CONFLICT (add/add): Merge conflict in src/test/test-cpu-set-util.c Auto-merging src/test/test-coredump-util.c CONFLICT (add/add): Merge conflict in src/test/test-coredump-util.c Auto-merging src/test/test-copy.c CONFLICT (add/add): Merge conflict in src/test/test-copy.c Auto-merging src/test/test-conf-parser.c CONFLICT (add/add): Merge conflict in src/test/test-conf-parser.c Auto-merging src/test/test-conf-files.c CONFLICT (add/add): Merge conflict in src/test/test-conf-files.c Auto-merging src/test/test-condition.c CONFLICT (add/add): Merge conflict in src/test/test-condition.c Auto-merging src/test/test-clock.c CONFLICT (add/add): Merge conflict in src/test/test-clock.c Auto-merging src/test/test-chown-rec.c CONFLICT (add/add): Merge conflict in src/test/test-chown-rec.c Auto-merging src/test/test-chase-symlinks.c CONFLICT (add/add): Merge conflict in src/test/test-chase-symlinks.c Auto-merging src/test/test-cgroup.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup.c Auto-merging src/test/test-cgroup-util.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-util.c Auto-merging src/test/test-cgroup-unit-default.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-unit-default.c Auto-merging src/test/test-cgroup-setup.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-setup.c Auto-merging src/test/test-cgroup-mask.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-mask.c Auto-merging src/test/test-cgroup-cpu.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-cpu.c Auto-merging src/test/test-capability.c CONFLICT (add/add): Merge conflict in src/test/test-capability.c Auto-merging src/test/test-cap-list.c CONFLICT (add/add): Merge conflict in src/test/test-cap-list.c Auto-merging src/test/test-calendarspec.c CONFLICT (add/add): Merge conflict in src/test/test-calendarspec.c Auto-merging src/test/test-bus-util.c CONFLICT (add/add): Merge conflict in src/test/test-bus-util.c Auto-merging src/test/test-btrfs.c CONFLICT (add/add): Merge conflict in src/test/test-btrfs.c Auto-merging src/test/test-bpf-firewall.c CONFLICT (add/add): Merge conflict in src/test/test-bpf-firewall.c Auto-merging src/test/test-bpf-devices.c CONFLICT (add/add): Merge conflict in src/test/test-bpf-devices.c Auto-merging src/test/test-boot-timestamps.c CONFLICT (add/add): Merge conflict in src/test/test-boot-timestamps.c Auto-merging src/test/test-bitmap.c CONFLICT (add/add): Merge conflict in src/test/test-bitmap.c Auto-merging src/test/test-barrier.c CONFLICT (add/add): Merge conflict in src/test/test-barrier.c Auto-merging src/test/test-async.c CONFLICT (add/add): Merge conflict in src/test/test-async.c Auto-merging src/test/test-ask-password-api.c CONFLICT (add/add): Merge conflict in src/test/test-ask-password-api.c Auto-merging src/test/test-arphrd-list.c CONFLICT (add/add): Merge conflict in src/test/test-arphrd-list.c Auto-merging src/test/test-architecture.c CONFLICT (add/add): Merge conflict in src/test/test-architecture.c Auto-merging src/test/test-alloc-util.c CONFLICT (add/add): Merge conflict in src/test/test-alloc-util.c Auto-merging src/test/test-af-list.c CONFLICT (add/add): Merge conflict in src/test/test-af-list.c Auto-merging src/test/test-acl-util.c CONFLICT (add/add): Merge conflict in src/test/test-acl-util.c Auto-merging src/test/meson.build CONFLICT (add/add): Merge conflict in src/test/meson.build Auto-merging src/sysv-generator/sysv-generator.c CONFLICT (add/add): Merge conflict in src/sysv-generator/sysv-generator.c Auto-merging src/sysusers/sysusers.c CONFLICT (add/add): Merge conflict in src/sysusers/sysusers.c Auto-merging src/systemd/sd-utf8.h CONFLICT (add/add): Merge conflict in src/systemd/sd-utf8.h Auto-merging src/systemd/sd-resolve.h CONFLICT (add/add): Merge conflict in src/systemd/sd-resolve.h Auto-merging src/systemd/sd-radv.h CONFLICT (add/add): Merge conflict in src/systemd/sd-radv.h Auto-merging src/systemd/sd-path.h CONFLICT (add/add): Merge conflict in src/systemd/sd-path.h Auto-merging src/systemd/sd-network.h CONFLICT (add/add): Merge conflict in src/systemd/sd-network.h Auto-merging src/systemd/sd-netlink.h CONFLICT (add/add): Merge conflict in src/systemd/sd-netlink.h Auto-merging src/systemd/sd-ndisc.h CONFLICT (add/add): Merge conflict in src/systemd/sd-ndisc.h Auto-merging src/systemd/sd-messages.h CONFLICT (add/add): Merge conflict in src/systemd/sd-messages.h Auto-merging src/systemd/sd-login.h CONFLICT (add/add): Merge conflict in src/systemd/sd-login.h Auto-merging src/systemd/sd-lldp.h CONFLICT (add/add): Merge conflict in src/systemd/sd-lldp.h Auto-merging src/systemd/sd-journal.h CONFLICT (add/add): Merge conflict in src/systemd/sd-journal.h Auto-merging src/systemd/sd-ipv4ll.h CONFLICT (add/add): Merge conflict in src/systemd/sd-ipv4ll.h Auto-merging src/systemd/sd-ipv4acd.h CONFLICT (add/add): Merge conflict in src/systemd/sd-ipv4acd.h Auto-merging src/systemd/sd-id128.h CONFLICT (add/add): Merge conflict in src/systemd/sd-id128.h Auto-merging src/systemd/sd-hwdb.h CONFLICT (add/add): Merge conflict in src/systemd/sd-hwdb.h Auto-merging src/systemd/sd-event.h CONFLICT (add/add): Merge conflict in src/systemd/sd-event.h Auto-merging src/systemd/sd-dhcp6-option.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp6-option.h Auto-merging src/systemd/sd-dhcp6-lease.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp6-lease.h Auto-merging src/systemd/sd-dhcp6-client.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp6-client.h Auto-merging src/systemd/sd-dhcp-server.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp-server.h Auto-merging src/systemd/sd-dhcp-option.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp-option.h Auto-merging src/systemd/sd-dhcp-lease.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp-lease.h Auto-merging src/systemd/sd-dhcp-client.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp-client.h Auto-merging src/systemd/sd-device.h CONFLICT (add/add): Merge conflict in src/systemd/sd-device.h Auto-merging src/systemd/sd-daemon.h CONFLICT (add/add): Merge conflict in src/systemd/sd-daemon.h Auto-merging src/systemd/sd-bus.h CONFLICT (add/add): Merge conflict in src/systemd/sd-bus.h Auto-merging src/systemd/sd-bus-vtable.h CONFLICT (add/add): Merge conflict in src/systemd/sd-bus-vtable.h Auto-merging src/systemd/sd-bus-protocol.h CONFLICT (add/add): Merge conflict in src/systemd/sd-bus-protocol.h Auto-merging src/systemd/meson.build CONFLICT (add/add): Merge conflict in src/systemd/meson.build Auto-merging src/systemd/_sd-common.h CONFLICT (add/add): Merge conflict in src/systemd/_sd-common.h Auto-merging src/systemctl/systemctl.c CONFLICT (add/add): Merge conflict in src/systemctl/systemctl.c Auto-merging src/system-update-generator/system-update-generator.c CONFLICT (add/add): Merge conflict in src/system-update-generator/system-update-generator.c Auto-merging src/sysctl/sysctl.c CONFLICT (add/add): Merge conflict in src/sysctl/sysctl.c Auto-merging src/sulogin-shell/sulogin-shell.c CONFLICT (add/add): Merge conflict in src/sulogin-shell/sulogin-shell.c Auto-merging src/stdio-bridge/stdio-bridge.c CONFLICT (add/add): Merge conflict in src/stdio-bridge/stdio-bridge.c Auto-merging src/socket-proxy/socket-proxyd.c CONFLICT (add/add): Merge conflict in src/socket-proxy/socket-proxyd.c Auto-merging src/sleep/sleep.c CONFLICT (add/add): Merge conflict in src/sleep/sleep.c Auto-merging src/shutdown/umount.h CONFLICT (add/add): Merge conflict in src/shutdown/umount.h Auto-merging src/shutdown/umount.c CONFLICT (add/add): Merge conflict in src/shutdown/umount.c Auto-merging src/shutdown/shutdown.c CONFLICT (add/add): Merge conflict in src/shutdown/shutdown.c Auto-merging src/shared/xml.h CONFLICT (add/add): Merge conflict in src/shared/xml.h Auto-merging src/shared/xml.c CONFLICT (add/add): Merge conflict in src/shared/xml.c Auto-merging src/shared/wifi-util.h CONFLICT (add/add): Merge conflict in src/shared/wifi-util.h Auto-merging src/shared/wifi-util.c CONFLICT (add/add): Merge conflict in src/shared/wifi-util.c Auto-merging src/shared/web-util.h CONFLICT (add/add): Merge conflict in src/shared/web-util.h Auto-merging src/shared/web-util.c CONFLICT (add/add): Merge conflict in src/shared/web-util.c Auto-merging src/shared/watchdog.h CONFLICT (add/add): Merge conflict in src/shared/watchdog.h Auto-merging src/shared/watchdog.c CONFLICT (add/add): Merge conflict in src/shared/watchdog.c Auto-merging src/shared/volatile-util.h CONFLICT (add/add): Merge conflict in src/shared/volatile-util.h Auto-merging src/shared/volatile-util.c CONFLICT (add/add): Merge conflict in src/shared/volatile-util.c Auto-merging src/shared/vlan-util.h CONFLICT (add/add): Merge conflict in src/shared/vlan-util.h Auto-merging src/shared/vlan-util.c CONFLICT (add/add): Merge conflict in src/shared/vlan-util.c Auto-merging src/shared/verbs.h CONFLICT (add/add): Merge conflict in src/shared/verbs.h Auto-merging src/shared/verbs.c CONFLICT (add/add): Merge conflict in src/shared/verbs.c Auto-merging src/shared/varlink.h CONFLICT (add/add): Merge conflict in src/shared/varlink.h Auto-merging src/shared/varlink.c CONFLICT (add/add): Merge conflict in src/shared/varlink.c Auto-merging src/shared/utmp-wtmp.h CONFLICT (add/add): Merge conflict in src/shared/utmp-wtmp.h Auto-merging src/shared/utmp-wtmp.c CONFLICT (add/add): Merge conflict in src/shared/utmp-wtmp.c Auto-merging src/shared/userdb.h CONFLICT (add/add): Merge conflict in src/shared/userdb.h Auto-merging src/shared/userdb.c CONFLICT (add/add): Merge conflict in src/shared/userdb.c Auto-merging src/shared/user-record.h CONFLICT (add/add): Merge conflict in src/shared/user-record.h Auto-merging src/shared/user-record.c CONFLICT (add/add): Merge conflict in src/shared/user-record.c Auto-merging src/shared/user-record-show.h CONFLICT (add/add): Merge conflict in src/shared/user-record-show.h Auto-merging src/shared/user-record-show.c CONFLICT (add/add): Merge conflict in src/shared/user-record-show.c Auto-merging src/shared/user-record-nss.h CONFLICT (add/add): Merge conflict in src/shared/user-record-nss.h Auto-merging src/shared/user-record-nss.c CONFLICT (add/add): Merge conflict in src/shared/user-record-nss.c Auto-merging src/shared/unit-file.h CONFLICT (add/add): Merge conflict in src/shared/unit-file.h Auto-merging src/shared/unit-file.c CONFLICT (add/add): Merge conflict in src/shared/unit-file.c Auto-merging src/shared/uid-range.h CONFLICT (add/add): Merge conflict in src/shared/uid-range.h Auto-merging src/shared/uid-range.c CONFLICT (add/add): Merge conflict in src/shared/uid-range.c Auto-merging src/shared/udev-util.h CONFLICT (add/add): Merge conflict in src/shared/udev-util.h Auto-merging src/shared/udev-util.c CONFLICT (add/add): Merge conflict in src/shared/udev-util.c Auto-merging src/shared/tomoyo-util.h CONFLICT (add/add): Merge conflict in src/shared/tomoyo-util.h Auto-merging src/shared/tomoyo-util.c CONFLICT (add/add): Merge conflict in src/shared/tomoyo-util.c Auto-merging src/shared/tmpfile-util-label.h CONFLICT (add/add): Merge conflict in src/shared/tmpfile-util-label.h Auto-merging src/shared/tmpfile-util-label.c CONFLICT (add/add): Merge conflict in src/shared/tmpfile-util-label.c Auto-merging src/shared/tests.h CONFLICT (add/add): Merge conflict in src/shared/tests.h Auto-merging src/shared/tests.c CONFLICT (add/add): Merge conflict in src/shared/tests.c Auto-merging src/shared/test-tables.h CONFLICT (add/add): Merge conflict in src/shared/test-tables.h Auto-merging src/shared/sysctl-util.h CONFLICT (add/add): Merge conflict in src/shared/sysctl-util.h Auto-merging src/shared/sysctl-util.c CONFLICT (add/add): Merge conflict in src/shared/sysctl-util.c Auto-merging src/shared/switch-root.h CONFLICT (add/add): Merge conflict in src/shared/switch-root.h Auto-merging src/shared/switch-root.c CONFLICT (add/add): Merge conflict in src/shared/switch-root.c Auto-merging src/shared/specifier.h CONFLICT (add/add): Merge conflict in src/shared/specifier.h Auto-merging src/shared/specifier.c CONFLICT (add/add): Merge conflict in src/shared/specifier.c Auto-merging src/shared/spawn-polkit-agent.h CONFLICT (add/add): Merge conflict in src/shared/spawn-polkit-agent.h Auto-merging src/shared/spawn-polkit-agent.c CONFLICT (add/add): Merge conflict in src/shared/spawn-polkit-agent.c Auto-merging src/shared/spawn-ask-password-agent.h CONFLICT (add/add): Merge conflict in src/shared/spawn-ask-password-agent.h Auto-merging src/shared/spawn-ask-password-agent.c CONFLICT (add/add): Merge conflict in src/shared/spawn-ask-password-agent.c Auto-merging src/shared/socket-netlink.h CONFLICT (add/add): Merge conflict in src/shared/socket-netlink.h Auto-merging src/shared/socket-netlink.c CONFLICT (add/add): Merge conflict in src/shared/socket-netlink.c Auto-merging src/shared/sleep-config.h CONFLICT (add/add): Merge conflict in src/shared/sleep-config.h Auto-merging src/shared/sleep-config.c CONFLICT (add/add): Merge conflict in src/shared/sleep-config.c Auto-merging src/shared/service-util.h CONFLICT (add/add): Merge conflict in src/shared/service-util.h Auto-merging src/shared/service-util.c CONFLICT (add/add): Merge conflict in src/shared/service-util.c Auto-merging src/shared/serialize.h CONFLICT (add/add): Merge conflict in src/shared/serialize.h Auto-merging src/shared/serialize.c CONFLICT (add/add): Merge conflict in src/shared/serialize.c Auto-merging src/shared/securebits-util.h CONFLICT (add/add): Merge conflict in src/shared/securebits-util.h Auto-merging src/shared/securebits-util.c CONFLICT (add/add): Merge conflict in src/shared/securebits-util.c Auto-merging src/shared/seccomp-util.h CONFLICT (add/add): Merge conflict in src/shared/seccomp-util.h Auto-merging src/shared/seccomp-util.c CONFLICT (add/add): Merge conflict in src/shared/seccomp-util.c Auto-merging src/shared/resolve-util.h CONFLICT (add/add): Merge conflict in src/shared/resolve-util.h Auto-merging src/shared/resolve-util.c CONFLICT (add/add): Merge conflict in src/shared/resolve-util.c Auto-merging src/shared/resize-fs.h CONFLICT (add/add): Merge conflict in src/shared/resize-fs.h Auto-merging src/shared/resize-fs.c CONFLICT (add/add): Merge conflict in src/shared/resize-fs.c Auto-merging src/shared/reboot-util.h CONFLICT (add/add): Merge conflict in src/shared/reboot-util.h Auto-merging src/shared/reboot-util.c CONFLICT (add/add): Merge conflict in src/shared/reboot-util.c Auto-merging src/shared/ptyfwd.h CONFLICT (add/add): Merge conflict in src/shared/ptyfwd.h Auto-merging src/shared/ptyfwd.c CONFLICT (add/add): Merge conflict in src/shared/ptyfwd.c Auto-merging src/shared/pretty-print.h CONFLICT (add/add): Merge conflict in src/shared/pretty-print.h Auto-merging src/shared/pretty-print.c CONFLICT (add/add): Merge conflict in src/shared/pretty-print.c Auto-merging src/shared/pkcs11-util.h CONFLICT (add/add): Merge conflict in src/shared/pkcs11-util.h Auto-merging src/shared/pkcs11-util.c CONFLICT (add/add): Merge conflict in src/shared/pkcs11-util.c Auto-merging src/shared/pe-header.h CONFLICT (add/add): Merge conflict in src/shared/pe-header.h Auto-merging src/shared/pam-util.h CONFLICT (add/add): Merge conflict in src/shared/pam-util.h Auto-merging src/shared/pam-util.c CONFLICT (add/add): Merge conflict in src/shared/pam-util.c Auto-merging src/shared/pager.h CONFLICT (add/add): Merge conflict in src/shared/pager.h Auto-merging src/shared/pager.c CONFLICT (add/add): Merge conflict in src/shared/pager.c Auto-merging src/shared/output-mode.h CONFLICT (add/add): Merge conflict in src/shared/output-mode.h Auto-merging src/shared/output-mode.c CONFLICT (add/add): Merge conflict in src/shared/output-mode.c Auto-merging src/shared/os-util.h CONFLICT (add/add): Merge conflict in src/shared/os-util.h Auto-merging src/shared/os-util.c CONFLICT (add/add): Merge conflict in src/shared/os-util.c Auto-merging src/shared/openssl-util.h CONFLICT (add/add): Merge conflict in src/shared/openssl-util.h Auto-merging src/shared/numa-util.h CONFLICT (add/add): Merge conflict in src/shared/numa-util.h Auto-merging src/shared/numa-util.c CONFLICT (add/add): Merge conflict in src/shared/numa-util.c Auto-merging src/shared/nsflags.h CONFLICT (add/add): Merge conflict in src/shared/nsflags.h Auto-merging src/shared/nsflags.c CONFLICT (add/add): Merge conflict in src/shared/nsflags.c Auto-merging src/shared/nscd-flush.h CONFLICT (add/add): Merge conflict in src/shared/nscd-flush.h Auto-merging src/shared/nscd-flush.c CONFLICT (add/add): Merge conflict in src/shared/nscd-flush.c Auto-merging src/shared/netif-naming-scheme.h CONFLICT (add/add): Merge conflict in src/shared/netif-naming-scheme.h Auto-merging src/shared/netif-naming-scheme.c CONFLICT (add/add): Merge conflict in src/shared/netif-naming-scheme.c Auto-merging src/shared/mount-util.h CONFLICT (add/add): Merge conflict in src/shared/mount-util.h Auto-merging src/shared/mount-util.c CONFLICT (add/add): Merge conflict in src/shared/mount-util.c Auto-merging src/shared/module-util.h CONFLICT (add/add): Merge conflict in src/shared/module-util.h Auto-merging src/shared/module-util.c CONFLICT (add/add): Merge conflict in src/shared/module-util.c Auto-merging src/shared/meson.build CONFLICT (add/add): Merge conflict in src/shared/meson.build Auto-merging src/shared/main-func.h CONFLICT (add/add): Merge conflict in src/shared/main-func.h Auto-merging src/shared/macvlan-util.h CONFLICT (add/add): Merge conflict in src/shared/macvlan-util.h Auto-merging src/shared/macvlan-util.c CONFLICT (add/add): Merge conflict in src/shared/macvlan-util.c Auto-merging src/shared/machine-pool.h CONFLICT (add/add): Merge conflict in src/shared/machine-pool.h Auto-merging src/shared/machine-pool.c CONFLICT (add/add): Merge conflict in src/shared/machine-pool.c Auto-merging src/shared/machine-image.h CONFLICT (add/add): Merge conflict in src/shared/machine-image.h Auto-merging src/shared/machine-image.c CONFLICT (add/add): Merge conflict in src/shared/machine-image.c Auto-merging src/shared/loop-util.h CONFLICT (add/add): Merge conflict in src/shared/loop-util.h Auto-merging src/shared/loop-util.c CONFLICT (add/add): Merge conflict in src/shared/loop-util.c Auto-merging src/shared/logs-show.h CONFLICT (add/add): Merge conflict in src/shared/logs-show.h Auto-merging src/shared/logs-show.c CONFLICT (add/add): Merge conflict in src/shared/logs-show.c Auto-merging src/shared/log-link.h CONFLICT (add/add): Merge conflict in src/shared/log-link.h Auto-merging src/shared/lockfile-util.h CONFLICT (add/add): Merge conflict in src/shared/lockfile-util.h Auto-merging src/shared/lockfile-util.c CONFLICT (add/add): Merge conflict in src/shared/lockfile-util.c Auto-merging src/shared/local-addresses.h CONFLICT (add/add): Merge conflict in src/shared/local-addresses.h Auto-merging src/shared/local-addresses.c CONFLICT (add/add): Merge conflict in src/shared/local-addresses.c Auto-merging src/shared/linux/nl80211.h CONFLICT (add/add): Merge conflict in src/shared/linux/nl80211.h Auto-merging src/shared/linux/ethtool.h CONFLICT (add/add): Merge conflict in src/shared/linux/ethtool.h Auto-merging src/shared/libmount-util.h CONFLICT (add/add): Merge conflict in src/shared/libmount-util.h Auto-merging src/shared/libcrypt-util.h CONFLICT (add/add): Merge conflict in src/shared/libcrypt-util.h Auto-merging src/shared/libcrypt-util.c CONFLICT (add/add): Merge conflict in src/shared/libcrypt-util.c Auto-merging src/shared/json.h CONFLICT (add/add): Merge conflict in src/shared/json.h Auto-merging src/shared/json.c CONFLICT (add/add): Merge conflict in src/shared/json.c Auto-merging src/shared/json-internal.h CONFLICT (add/add): Merge conflict in src/shared/json-internal.h Auto-merging src/shared/journal-util.h CONFLICT (add/add): Merge conflict in src/shared/journal-util.h Auto-merging src/shared/journal-util.c CONFLICT (add/add): Merge conflict in src/shared/journal-util.c Auto-merging src/shared/journal-importer.h CONFLICT (add/add): Merge conflict in src/shared/journal-importer.h Auto-merging src/shared/journal-importer.c CONFLICT (add/add): Merge conflict in src/shared/journal-importer.c Auto-merging src/shared/ipvlan-util.h CONFLICT (add/add): Merge conflict in src/shared/ipvlan-util.h Auto-merging src/shared/ipvlan-util.c CONFLICT (add/add): Merge conflict in src/shared/ipvlan-util.c Auto-merging src/shared/ip-protocol-list.h CONFLICT (add/add): Merge conflict in src/shared/ip-protocol-list.h Auto-merging src/shared/ip-protocol-list.c CONFLICT (add/add): Merge conflict in src/shared/ip-protocol-list.c Auto-merging src/shared/install.h CONFLICT (add/add): Merge conflict in src/shared/install.h Auto-merging src/shared/install.c CONFLICT (add/add): Merge conflict in src/shared/install.c Auto-merging src/shared/install-printf.h CONFLICT (add/add): Merge conflict in src/shared/install-printf.h Auto-merging src/shared/install-printf.c CONFLICT (add/add): Merge conflict in src/shared/install-printf.c Auto-merging src/shared/initreq.h CONFLICT (add/add): Merge conflict in src/shared/initreq.h Auto-merging src/shared/import-util.h CONFLICT (add/add): Merge conflict in src/shared/import-util.h Auto-merging src/shared/import-util.c CONFLICT (add/add): Merge conflict in src/shared/import-util.c Auto-merging src/shared/ima-util.h CONFLICT (add/add): Merge conflict in src/shared/ima-util.h Auto-merging src/shared/ima-util.c CONFLICT (add/add): Merge conflict in src/shared/ima-util.c Auto-merging src/shared/id128-print.h CONFLICT (add/add): Merge conflict in src/shared/id128-print.h Auto-merging src/shared/id128-print.c CONFLICT (add/add): Merge conflict in src/shared/id128-print.c Auto-merging src/shared/group-record.h CONFLICT (add/add): Merge conflict in src/shared/group-record.h Auto-merging src/shared/group-record.c CONFLICT (add/add): Merge conflict in src/shared/group-record.c Auto-merging src/shared/gpt.h CONFLICT (add/add): Merge conflict in src/shared/gpt.h Auto-merging src/shared/gpt.c CONFLICT (add/add): Merge conflict in src/shared/gpt.c Auto-merging src/shared/geneve-util.h CONFLICT (add/add): Merge conflict in src/shared/geneve-util.h Auto-merging src/shared/geneve-util.c CONFLICT (add/add): Merge conflict in src/shared/geneve-util.c Auto-merging src/shared/generator.h CONFLICT (add/add): Merge conflict in src/shared/generator.h Auto-merging src/shared/generator.c CONFLICT (add/add): Merge conflict in src/shared/generator.c Auto-merging src/shared/fstab-util.h CONFLICT (add/add): Merge conflict in src/shared/fstab-util.h Auto-merging src/shared/fstab-util.c CONFLICT (add/add): Merge conflict in src/shared/fstab-util.c Auto-merging src/shared/fsck-util.h CONFLICT (add/add): Merge conflict in src/shared/fsck-util.h Auto-merging src/shared/format-table.h CONFLICT (add/add): Merge conflict in src/shared/format-table.h Auto-merging src/shared/format-table.c CONFLICT (add/add): Merge conflict in src/shared/format-table.c Auto-merging src/shared/firewall-util.h CONFLICT (add/add): Merge conflict in src/shared/firewall-util.h Auto-merging src/shared/firewall-util.c CONFLICT (add/add): Merge conflict in src/shared/firewall-util.c Auto-merging src/shared/fileio-label.h CONFLICT (add/add): Merge conflict in src/shared/fileio-label.h Auto-merging src/shared/fileio-label.c CONFLICT (add/add): Merge conflict in src/shared/fileio-label.c Auto-merging src/shared/fdset.h CONFLICT (add/add): Merge conflict in src/shared/fdset.h Auto-merging src/shared/fdset.c CONFLICT (add/add): Merge conflict in src/shared/fdset.c Auto-merging src/shared/exit-status.h CONFLICT (add/add): Merge conflict in src/shared/exit-status.h Auto-merging src/shared/exit-status.c CONFLICT (add/add): Merge conflict in src/shared/exit-status.c Auto-merging src/shared/exec-util.h CONFLICT (add/add): Merge conflict in src/shared/exec-util.h Auto-merging src/shared/exec-util.c CONFLICT (add/add): Merge conflict in src/shared/exec-util.c Auto-merging src/shared/ethtool-util.h CONFLICT (add/add): Merge conflict in src/shared/ethtool-util.h Auto-merging src/shared/ethtool-util.c CONFLICT (add/add): Merge conflict in src/shared/ethtool-util.c Auto-merging src/shared/env-file-label.h CONFLICT (add/add): Merge conflict in src/shared/env-file-label.h Auto-merging src/shared/env-file-label.c CONFLICT (add/add): Merge conflict in src/shared/env-file-label.c Auto-merging src/shared/enable-mempool.c CONFLICT (add/add): Merge conflict in src/shared/enable-mempool.c Auto-merging src/shared/efi-loader.h CONFLICT (add/add): Merge conflict in src/shared/efi-loader.h Auto-merging src/shared/efi-loader.c CONFLICT (add/add): Merge conflict in src/shared/efi-loader.c Auto-merging src/shared/dropin.h CONFLICT (add/add): Merge conflict in src/shared/dropin.h Auto-merging src/shared/dropin.c CONFLICT (add/add): Merge conflict in src/shared/dropin.c Auto-merging src/shared/dns-domain.h CONFLICT (add/add): Merge conflict in src/shared/dns-domain.h Auto-merging src/shared/dns-domain.c CONFLICT (add/add): Merge conflict in src/shared/dns-domain.c Auto-merging src/shared/dm-util.h CONFLICT (add/add): Merge conflict in src/shared/dm-util.h Auto-merging src/shared/dm-util.c CONFLICT (add/add): Merge conflict in src/shared/dm-util.c Auto-merging src/shared/dissect-image.h CONFLICT (add/add): Merge conflict in src/shared/dissect-image.h Auto-merging src/shared/dissect-image.c CONFLICT (add/add): Merge conflict in src/shared/dissect-image.c Auto-merging src/shared/dev-setup.h CONFLICT (add/add): Merge conflict in src/shared/dev-setup.h Auto-merging src/shared/dev-setup.c CONFLICT (add/add): Merge conflict in src/shared/dev-setup.c Auto-merging src/shared/daemon-util.h CONFLICT (add/add): Merge conflict in src/shared/daemon-util.h Auto-merging src/shared/cpu-set-util.h CONFLICT (add/add): Merge conflict in src/shared/cpu-set-util.h Auto-merging src/shared/cpu-set-util.c CONFLICT (add/add): Merge conflict in src/shared/cpu-set-util.c Auto-merging src/shared/coredump-util.h CONFLICT (add/add): Merge conflict in src/shared/coredump-util.h Auto-merging src/shared/coredump-util.c CONFLICT (add/add): Merge conflict in src/shared/coredump-util.c Auto-merging src/shared/conf-parser.h CONFLICT (add/add): Merge conflict in src/shared/conf-parser.h Auto-merging src/shared/conf-parser.c CONFLICT (add/add): Merge conflict in src/shared/conf-parser.c Auto-merging src/shared/condition.h CONFLICT (add/add): Merge conflict in src/shared/condition.h Auto-merging src/shared/condition.c CONFLICT (add/add): Merge conflict in src/shared/condition.c Auto-merging src/shared/clock-util.h CONFLICT (add/add): Merge conflict in src/shared/clock-util.h Auto-merging src/shared/clock-util.c CONFLICT (add/add): Merge conflict in src/shared/clock-util.c Auto-merging src/shared/clean-ipc.h CONFLICT (add/add): Merge conflict in src/shared/clean-ipc.h Auto-merging src/shared/clean-ipc.c CONFLICT (add/add): Merge conflict in src/shared/clean-ipc.c Auto-merging src/shared/chown-recursive.h CONFLICT (add/add): Merge conflict in src/shared/chown-recursive.h Auto-merging src/shared/chown-recursive.c CONFLICT (add/add): Merge conflict in src/shared/chown-recursive.c Auto-merging src/shared/cgroup-show.h CONFLICT (add/add): Merge conflict in src/shared/cgroup-show.h Auto-merging src/shared/cgroup-show.c CONFLICT (add/add): Merge conflict in src/shared/cgroup-show.c Auto-merging src/shared/cgroup-setup.h CONFLICT (add/add): Merge conflict in src/shared/cgroup-setup.h Auto-merging src/shared/cgroup-setup.c CONFLICT (add/add): Merge conflict in src/shared/cgroup-setup.c Auto-merging src/shared/calendarspec.h CONFLICT (add/add): Merge conflict in src/shared/calendarspec.h Auto-merging src/shared/calendarspec.c CONFLICT (add/add): Merge conflict in src/shared/calendarspec.c Auto-merging src/shared/bus-wait-for-units.h CONFLICT (add/add): Merge conflict in src/shared/bus-wait-for-units.h Auto-merging src/shared/bus-wait-for-units.c CONFLICT (add/add): Merge conflict in src/shared/bus-wait-for-units.c Auto-merging src/shared/bus-wait-for-jobs.h CONFLICT (add/add): Merge conflict in src/shared/bus-wait-for-jobs.h Auto-merging src/shared/bus-wait-for-jobs.c CONFLICT (add/add): Merge conflict in src/shared/bus-wait-for-jobs.c Auto-merging src/shared/bus-util.h CONFLICT (add/add): Merge conflict in src/shared/bus-util.h Auto-merging src/shared/bus-util.c CONFLICT (add/add): Merge conflict in src/shared/bus-util.c Auto-merging src/shared/bus-unit-util.h CONFLICT (add/add): Merge conflict in src/shared/bus-unit-util.h Auto-merging src/shared/bus-unit-util.c CONFLICT (add/add): Merge conflict in src/shared/bus-unit-util.c Auto-merging src/shared/bus-unit-procs.h CONFLICT (add/add): Merge conflict in src/shared/bus-unit-procs.h Auto-merging src/shared/bus-unit-procs.c CONFLICT (add/add): Merge conflict in src/shared/bus-unit-procs.c Auto-merging src/shared/bus-polkit.h CONFLICT (add/add): Merge conflict in src/shared/bus-polkit.h Auto-merging src/shared/bus-polkit.c CONFLICT (add/add): Merge conflict in src/shared/bus-polkit.c Auto-merging src/shared/bus-log-control-api.h CONFLICT (add/add): Merge conflict in src/shared/bus-log-control-api.h Auto-merging src/shared/bus-log-control-api.c CONFLICT (add/add): Merge conflict in src/shared/bus-log-control-api.c Auto-merging src/shared/bus-locator.h CONFLICT (add/add): Merge conflict in src/shared/bus-locator.h Auto-merging src/shared/bus-locator.c CONFLICT (add/add): Merge conflict in src/shared/bus-locator.c Auto-merging src/shared/bridge-util.h CONFLICT (add/add): Merge conflict in src/shared/bridge-util.h Auto-merging src/shared/bridge-util.c CONFLICT (add/add): Merge conflict in src/shared/bridge-util.c Auto-merging src/shared/bpf-program.h CONFLICT (add/add): Merge conflict in src/shared/bpf-program.h Auto-merging src/shared/bpf-program.c CONFLICT (add/add): Merge conflict in src/shared/bpf-program.c Auto-merging src/shared/bootspec.h CONFLICT (add/add): Merge conflict in src/shared/bootspec.h Auto-merging src/shared/bootspec.c CONFLICT (add/add): Merge conflict in src/shared/bootspec.c Auto-merging src/shared/boot-timestamps.h CONFLICT (add/add): Merge conflict in src/shared/boot-timestamps.h Auto-merging src/shared/boot-timestamps.c CONFLICT (add/add): Merge conflict in src/shared/boot-timestamps.c Auto-merging src/shared/bond-util.h CONFLICT (add/add): Merge conflict in src/shared/bond-util.h Auto-merging src/shared/bond-util.c CONFLICT (add/add): Merge conflict in src/shared/bond-util.c Auto-merging src/shared/blkid-util.h CONFLICT (add/add): Merge conflict in src/shared/blkid-util.h Auto-merging src/shared/bitmap.h CONFLICT (add/add): Merge conflict in src/shared/bitmap.h Auto-merging src/shared/bitmap.c CONFLICT (add/add): Merge conflict in src/shared/bitmap.c Auto-merging src/shared/binfmt-util.h CONFLICT (add/add): Merge conflict in src/shared/binfmt-util.h Auto-merging src/shared/binfmt-util.c CONFLICT (add/add): Merge conflict in src/shared/binfmt-util.c Auto-merging src/shared/base-filesystem.h CONFLICT (add/add): Merge conflict in src/shared/base-filesystem.h Auto-merging src/shared/base-filesystem.c CONFLICT (add/add): Merge conflict in src/shared/base-filesystem.c Auto-merging src/shared/barrier.h CONFLICT (add/add): Merge conflict in src/shared/barrier.h Auto-merging src/shared/barrier.c CONFLICT (add/add): Merge conflict in src/shared/barrier.c Auto-merging src/shared/ask-password-api.h CONFLICT (add/add): Merge conflict in src/shared/ask-password-api.h Auto-merging src/shared/ask-password-api.c CONFLICT (add/add): Merge conflict in src/shared/ask-password-api.c Auto-merging src/shared/apparmor-util.h CONFLICT (add/add): Merge conflict in src/shared/apparmor-util.h Auto-merging src/shared/apparmor-util.c CONFLICT (add/add): Merge conflict in src/shared/apparmor-util.c Auto-merging src/shared/acpi-fpdt.h CONFLICT (add/add): Merge conflict in src/shared/acpi-fpdt.h Auto-merging src/shared/acpi-fpdt.c CONFLICT (add/add): Merge conflict in src/shared/acpi-fpdt.c Auto-merging src/shared/acl-util.h CONFLICT (add/add): Merge conflict in src/shared/acl-util.h Auto-merging src/shared/acl-util.c CONFLICT (add/add): Merge conflict in src/shared/acl-util.c Auto-merging src/run/run.c CONFLICT (add/add): Merge conflict in src/run/run.c Auto-merging src/run-generator/run-generator.c CONFLICT (add/add): Merge conflict in src/run-generator/run-generator.c Auto-merging src/rfkill/rfkill.c CONFLICT (add/add): Merge conflict in src/rfkill/rfkill.c Auto-merging src/resolve/test-resolved-packet.c CONFLICT (add/add): Merge conflict in src/resolve/test-resolved-packet.c Auto-merging src/resolve/test-resolved-etc-hosts.c CONFLICT (add/add): Merge conflict in src/resolve/test-resolved-etc-hosts.c Auto-merging src/resolve/test-resolve-tables.c CONFLICT (add/add): Merge conflict in src/resolve/test-resolve-tables.c Auto-merging src/resolve/test-dnssec.c CONFLICT (add/add): Merge conflict in src/resolve/test-dnssec.c Auto-merging src/resolve/test-dnssec-complex.c CONFLICT (add/add): Merge conflict in src/resolve/test-dnssec-complex.c Auto-merging src/resolve/test-dns-packet.c CONFLICT (add/add): Merge conflict in src/resolve/test-dns-packet.c Auto-merging src/resolve/resolved.conf.in CONFLICT (add/add): Merge conflict in src/resolve/resolved.conf.in Auto-merging src/resolve/resolved.c CONFLICT (add/add): Merge conflict in src/resolve/resolved.c Auto-merging src/resolve/resolved-resolv-conf.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-resolv-conf.h Auto-merging src/resolve/resolved-resolv-conf.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-resolv-conf.c Auto-merging src/resolve/resolved-mdns.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-mdns.h Auto-merging src/resolve/resolved-mdns.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-mdns.c Auto-merging src/resolve/resolved-manager.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-manager.h Auto-merging src/resolve/resolved-manager.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-manager.c Auto-merging src/resolve/resolved-llmnr.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-llmnr.h Auto-merging src/resolve/resolved-llmnr.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-llmnr.c Auto-merging src/resolve/resolved-link.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-link.h Auto-merging src/resolve/resolved-link.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-link.c Auto-merging src/resolve/resolved-link-bus.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-link-bus.h Auto-merging src/resolve/resolved-link-bus.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-link-bus.c Auto-merging src/resolve/resolved-gperf.gperf CONFLICT (add/add): Merge conflict in src/resolve/resolved-gperf.gperf Auto-merging src/resolve/resolved-etc-hosts.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-etc-hosts.h Auto-merging src/resolve/resolved-etc-hosts.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-etc-hosts.c Auto-merging src/resolve/resolved-dnstls.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls.h Auto-merging src/resolve/resolved-dnstls-openssl.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls-openssl.h Auto-merging src/resolve/resolved-dnstls-openssl.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls-openssl.c Auto-merging src/resolve/resolved-dnstls-gnutls.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls-gnutls.h Auto-merging src/resolve/resolved-dnstls-gnutls.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls-gnutls.c Auto-merging src/resolve/resolved-dnssd.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnssd.h Auto-merging src/resolve/resolved-dnssd.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnssd.c Auto-merging src/resolve/resolved-dnssd-bus.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnssd-bus.h Auto-merging src/resolve/resolved-dnssd-bus.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnssd-bus.c Auto-merging src/resolve/resolved-dns-zone.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-zone.h Auto-merging src/resolve/resolved-dns-zone.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-zone.c Auto-merging src/resolve/resolved-dns-trust-anchor.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-trust-anchor.h Auto-merging src/resolve/resolved-dns-trust-anchor.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-trust-anchor.c Auto-merging src/resolve/resolved-dns-transaction.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-transaction.h Auto-merging src/resolve/resolved-dns-transaction.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-transaction.c Auto-merging src/resolve/resolved-dns-synthesize.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-synthesize.h Auto-merging src/resolve/resolved-dns-synthesize.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-synthesize.c Auto-merging src/resolve/resolved-dns-stub.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-stub.h Auto-merging src/resolve/resolved-dns-stub.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-stub.c Auto-merging src/resolve/resolved-dns-stream.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-stream.h Auto-merging src/resolve/resolved-dns-stream.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-stream.c Auto-merging src/resolve/resolved-dns-server.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-server.h Auto-merging src/resolve/resolved-dns-server.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-server.c Auto-merging src/resolve/resolved-dns-search-domain.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-search-domain.h Auto-merging src/resolve/resolved-dns-search-domain.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-search-domain.c Auto-merging src/resolve/resolved-dns-scope.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-scope.h Auto-merging src/resolve/resolved-dns-scope.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-scope.c Auto-merging src/resolve/resolved-dns-rr.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-rr.h Auto-merging src/resolve/resolved-dns-rr.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-rr.c Auto-merging src/resolve/resolved-dns-question.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-question.h Auto-merging src/resolve/resolved-dns-question.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-question.c Auto-merging src/resolve/resolved-dns-query.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-query.h Auto-merging src/resolve/resolved-dns-query.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-query.c Auto-merging src/resolve/resolved-dns-packet.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-packet.h Auto-merging src/resolve/resolved-dns-packet.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-packet.c Auto-merging src/resolve/resolved-dns-dnssec.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-dnssec.h Auto-merging src/resolve/resolved-dns-dnssec.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-dnssec.c Auto-merging src/resolve/resolved-dns-cache.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-cache.h Auto-merging src/resolve/resolved-dns-cache.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-cache.c Auto-merging src/resolve/resolved-dns-answer.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-answer.h Auto-merging src/resolve/resolved-dns-answer.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-answer.c Auto-merging src/resolve/resolved-def.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-def.h Auto-merging src/resolve/resolved-conf.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-conf.h Auto-merging src/resolve/resolved-conf.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-conf.c Auto-merging src/resolve/resolved-bus.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-bus.h Auto-merging src/resolve/resolved-bus.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-bus.c Auto-merging src/resolve/resolvectl.h CONFLICT (add/add): Merge conflict in src/resolve/resolvectl.h Auto-merging src/resolve/resolvectl.c CONFLICT (add/add): Merge conflict in src/resolve/resolvectl.c Auto-merging src/resolve/resolvconf-compat.h CONFLICT (add/add): Merge conflict in src/resolve/resolvconf-compat.h Auto-merging src/resolve/resolvconf-compat.c CONFLICT (add/add): Merge conflict in src/resolve/resolvconf-compat.c Auto-merging src/resolve/resolv.conf CONFLICT (add/add): Merge conflict in src/resolve/resolv.conf Auto-merging src/resolve/org.freedesktop.resolve1.service CONFLICT (add/add): Merge conflict in src/resolve/org.freedesktop.resolve1.service Auto-merging src/resolve/org.freedesktop.resolve1.policy CONFLICT (add/add): Merge conflict in src/resolve/org.freedesktop.resolve1.policy Auto-merging src/resolve/meson.build CONFLICT (add/add): Merge conflict in src/resolve/meson.build Auto-merging src/resolve/dns-type.h CONFLICT (add/add): Merge conflict in src/resolve/dns-type.h Auto-merging src/resolve/dns-type.c CONFLICT (add/add): Merge conflict in src/resolve/dns-type.c Auto-merging src/reply-password/reply-password.c CONFLICT (add/add): Merge conflict in src/reply-password/reply-password.c Auto-merging src/remount-fs/remount-fs.c CONFLICT (add/add): Merge conflict in src/remount-fs/remount-fs.c Auto-merging src/rc-local-generator/rc-local-generator.c CONFLICT (add/add): Merge conflict in src/rc-local-generator/rc-local-generator.c Auto-merging src/random-seed/random-seed.c CONFLICT (add/add): Merge conflict in src/random-seed/random-seed.c Auto-merging src/quotacheck/quotacheck.c CONFLICT (add/add): Merge conflict in src/quotacheck/quotacheck.c Auto-merging src/pstore/pstore.c CONFLICT (add/add): Merge conflict in src/pstore/pstore.c Auto-merging src/pstore/meson.build CONFLICT (add/add): Merge conflict in src/pstore/meson.build Auto-merging src/portable/portabled.h CONFLICT (add/add): Merge conflict in src/portable/portabled.h Auto-merging src/portable/portabled.c CONFLICT (add/add): Merge conflict in src/portable/portabled.c Auto-merging src/portable/portabled-operation.h CONFLICT (add/add): Merge conflict in src/portable/portabled-operation.h Auto-merging src/portable/portabled-operation.c CONFLICT (add/add): Merge conflict in src/portable/portabled-operation.c Auto-merging src/portable/portabled-image.h CONFLICT (add/add): Merge conflict in src/portable/portabled-image.h Auto-merging src/portable/portabled-image.c CONFLICT (add/add): Merge conflict in src/portable/portabled-image.c Auto-merging src/portable/portabled-image-bus.h CONFLICT (add/add): Merge conflict in src/portable/portabled-image-bus.h Auto-merging src/portable/portabled-image-bus.c CONFLICT (add/add): Merge conflict in src/portable/portabled-image-bus.c Auto-merging src/portable/portabled-bus.h CONFLICT (add/add): Merge conflict in src/portable/portabled-bus.h Auto-merging src/portable/portabled-bus.c CONFLICT (add/add): Merge conflict in src/portable/portabled-bus.c Auto-merging src/portable/portablectl.c CONFLICT (add/add): Merge conflict in src/portable/portablectl.c Auto-merging src/portable/portable.h CONFLICT (add/add): Merge conflict in src/portable/portable.h Auto-merging src/portable/portable.c CONFLICT (add/add): Merge conflict in src/portable/portable.c Auto-merging src/portable/org.freedesktop.portable1.service CONFLICT (add/add): Merge conflict in src/portable/org.freedesktop.portable1.service Auto-merging src/portable/org.freedesktop.portable1.policy CONFLICT (add/add): Merge conflict in src/portable/org.freedesktop.portable1.policy Auto-merging src/portable/org.freedesktop.portable1.conf CONFLICT (add/add): Merge conflict in src/portable/org.freedesktop.portable1.conf Auto-merging src/portable/meson.build CONFLICT (add/add): Merge conflict in src/portable/meson.build Auto-merging src/path/path.c CONFLICT (add/add): Merge conflict in src/path/path.c Auto-merging src/partition/test-repart.sh CONFLICT (add/add): Merge conflict in src/partition/test-repart.sh Auto-merging src/partition/repart.c CONFLICT (add/add): Merge conflict in src/partition/repart.c Auto-merging src/partition/meson.build CONFLICT (add/add): Merge conflict in src/partition/meson.build Auto-merging src/partition/makefs.c CONFLICT (add/add): Merge conflict in src/partition/makefs.c Auto-merging src/partition/growfs.c CONFLICT (add/add): Merge conflict in src/partition/growfs.c Auto-merging src/nss-systemd/userdb-glue.h CONFLICT (add/add): Merge conflict in src/nss-systemd/userdb-glue.h Auto-merging src/nss-systemd/userdb-glue.c CONFLICT (add/add): Merge conflict in src/nss-systemd/userdb-glue.c Auto-merging src/nss-systemd/nss-systemd.sym CONFLICT (add/add): Merge conflict in src/nss-systemd/nss-systemd.sym Auto-merging src/nss-systemd/nss-systemd.c CONFLICT (add/add): Merge conflict in src/nss-systemd/nss-systemd.c Auto-merging src/nss-resolve/nss-resolve.sym CONFLICT (add/add): Merge conflict in src/nss-resolve/nss-resolve.sym Auto-merging src/nss-resolve/nss-resolve.c CONFLICT (add/add): Merge conflict in src/nss-resolve/nss-resolve.c Auto-merging src/nss-mymachines/nss-mymachines.sym CONFLICT (add/add): Merge conflict in src/nss-mymachines/nss-mymachines.sym Auto-merging src/nss-mymachines/nss-mymachines.c CONFLICT (add/add): Merge conflict in src/nss-mymachines/nss-mymachines.c Auto-merging src/nss-myhostname/nss-myhostname.sym CONFLICT (add/add): Merge conflict in src/nss-myhostname/nss-myhostname.sym Auto-merging src/nss-myhostname/nss-myhostname.c CONFLICT (add/add): Merge conflict in src/nss-myhostname/nss-myhostname.c Auto-merging src/nspawn/test-patch-uid.c CONFLICT (add/add): Merge conflict in src/nspawn/test-patch-uid.c Auto-merging src/nspawn/test-nspawn-tables.c CONFLICT (add/add): Merge conflict in src/nspawn/test-nspawn-tables.c Auto-merging src/nspawn/nspawn.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn.c Auto-merging src/nspawn/nspawn-stub-pid1.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-stub-pid1.h Auto-merging src/nspawn/nspawn-stub-pid1.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-stub-pid1.c Auto-merging src/nspawn/nspawn-setuid.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-setuid.h Auto-merging src/nspawn/nspawn-setuid.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-setuid.c Auto-merging src/nspawn/nspawn-settings.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-settings.h Auto-merging src/nspawn/nspawn-settings.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-settings.c Auto-merging src/nspawn/nspawn-seccomp.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-seccomp.h Auto-merging src/nspawn/nspawn-seccomp.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-seccomp.c Auto-merging src/nspawn/nspawn-register.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-register.h Auto-merging src/nspawn/nspawn-register.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-register.c Auto-merging src/nspawn/nspawn-patch-uid.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-patch-uid.h Auto-merging src/nspawn/nspawn-patch-uid.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-patch-uid.c Auto-merging src/nspawn/nspawn-oci.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-oci.h Auto-merging src/nspawn/nspawn-oci.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-oci.c Auto-merging src/nspawn/nspawn-network.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-network.h Auto-merging src/nspawn/nspawn-network.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-network.c Auto-merging src/nspawn/nspawn-mount.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-mount.h Auto-merging src/nspawn/nspawn-mount.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-mount.c Auto-merging src/nspawn/nspawn-expose-ports.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-expose-ports.h Auto-merging src/nspawn/nspawn-expose-ports.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-expose-ports.c Auto-merging src/nspawn/nspawn-def.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-def.h Auto-merging src/nspawn/nspawn-cgroup.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-cgroup.h Auto-merging src/nspawn/nspawn-cgroup.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-cgroup.c Auto-merging src/nspawn/meson.build CONFLICT (add/add): Merge conflict in src/nspawn/meson.build Auto-merging src/notify/notify.c CONFLICT (add/add): Merge conflict in src/notify/notify.c Auto-merging src/network/wait-online/wait-online.c CONFLICT (add/add): Merge conflict in src/network/wait-online/wait-online.c Auto-merging src/network/wait-online/manager.h CONFLICT (add/add): Merge conflict in src/network/wait-online/manager.h Auto-merging src/network/wait-online/manager.c CONFLICT (add/add): Merge conflict in src/network/wait-online/manager.c Auto-merging src/network/wait-online/link.h CONFLICT (add/add): Merge conflict in src/network/wait-online/link.h Auto-merging src/network/wait-online/link.c CONFLICT (add/add): Merge conflict in src/network/wait-online/link.c Auto-merging src/network/test-routing-policy-rule.c CONFLICT (add/add): Merge conflict in src/network/test-routing-policy-rule.c Auto-merging src/network/test-networkd-conf.c CONFLICT (add/add): Merge conflict in src/network/test-networkd-conf.c Auto-merging src/network/test-network.c CONFLICT (add/add): Merge conflict in src/network/test-network.c Auto-merging src/network/test-network-tables.c CONFLICT (add/add): Merge conflict in src/network/test-network-tables.c Auto-merging src/network/tc/teql.h CONFLICT (add/add): Merge conflict in src/network/tc/teql.h Auto-merging src/network/tc/teql.c CONFLICT (add/add): Merge conflict in src/network/tc/teql.c Auto-merging src/network/tc/tclass.h CONFLICT (add/add): Merge conflict in src/network/tc/tclass.h Auto-merging src/network/tc/tclass.c CONFLICT (add/add): Merge conflict in src/network/tc/tclass.c Auto-merging src/network/tc/tc.h CONFLICT (add/add): Merge conflict in src/network/tc/tc.h Auto-merging src/network/tc/tc.c CONFLICT (add/add): Merge conflict in src/network/tc/tc.c Auto-merging src/network/tc/tc-util.h CONFLICT (add/add): Merge conflict in src/network/tc/tc-util.h Auto-merging src/network/tc/tc-util.c CONFLICT (add/add): Merge conflict in src/network/tc/tc-util.c Auto-merging src/network/tc/tbf.h CONFLICT (add/add): Merge conflict in src/network/tc/tbf.h Auto-merging src/network/tc/tbf.c CONFLICT (add/add): Merge conflict in src/network/tc/tbf.c Auto-merging src/network/tc/sfq.h CONFLICT (add/add): Merge conflict in src/network/tc/sfq.h Auto-merging src/network/tc/sfq.c CONFLICT (add/add): Merge conflict in src/network/tc/sfq.c Auto-merging src/network/tc/sfb.h CONFLICT (add/add): Merge conflict in src/network/tc/sfb.h Auto-merging src/network/tc/sfb.c CONFLICT (add/add): Merge conflict in src/network/tc/sfb.c Auto-merging src/network/tc/qfq.h CONFLICT (add/add): Merge conflict in src/network/tc/qfq.h Auto-merging src/network/tc/qfq.c CONFLICT (add/add): Merge conflict in src/network/tc/qfq.c Auto-merging src/network/tc/qdisc.h CONFLICT (add/add): Merge conflict in src/network/tc/qdisc.h Auto-merging src/network/tc/qdisc.c CONFLICT (add/add): Merge conflict in src/network/tc/qdisc.c Auto-merging src/network/tc/pie.h CONFLICT (add/add): Merge conflict in src/network/tc/pie.h Auto-merging src/network/tc/pie.c CONFLICT (add/add): Merge conflict in src/network/tc/pie.c Auto-merging src/network/tc/netem.h CONFLICT (add/add): Merge conflict in src/network/tc/netem.h Auto-merging src/network/tc/netem.c CONFLICT (add/add): Merge conflict in src/network/tc/netem.c Auto-merging src/network/tc/htb.h CONFLICT (add/add): Merge conflict in src/network/tc/htb.h Auto-merging src/network/tc/htb.c CONFLICT (add/add): Merge conflict in src/network/tc/htb.c Auto-merging src/network/tc/hhf.h CONFLICT (add/add): Merge conflict in src/network/tc/hhf.h Auto-merging src/network/tc/hhf.c CONFLICT (add/add): Merge conflict in src/network/tc/hhf.c Auto-merging src/network/tc/gred.h CONFLICT (add/add): Merge conflict in src/network/tc/gred.h Auto-merging src/network/tc/gred.c CONFLICT (add/add): Merge conflict in src/network/tc/gred.c Auto-merging src/network/tc/fq.h CONFLICT (add/add): Merge conflict in src/network/tc/fq.h Auto-merging src/network/tc/fq.c CONFLICT (add/add): Merge conflict in src/network/tc/fq.c Auto-merging src/network/tc/fq-codel.h CONFLICT (add/add): Merge conflict in src/network/tc/fq-codel.h Auto-merging src/network/tc/fq-codel.c CONFLICT (add/add): Merge conflict in src/network/tc/fq-codel.c Auto-merging src/network/tc/fifo.h CONFLICT (add/add): Merge conflict in src/network/tc/fifo.h Auto-merging src/network/tc/fifo.c CONFLICT (add/add): Merge conflict in src/network/tc/fifo.c Auto-merging src/network/tc/drr.h CONFLICT (add/add): Merge conflict in src/network/tc/drr.h Auto-merging src/network/tc/drr.c CONFLICT (add/add): Merge conflict in src/network/tc/drr.c Auto-merging src/network/tc/codel.h CONFLICT (add/add): Merge conflict in src/network/tc/codel.h Auto-merging src/network/tc/codel.c CONFLICT (add/add): Merge conflict in src/network/tc/codel.c Auto-merging src/network/tc/cake.h CONFLICT (add/add): Merge conflict in src/network/tc/cake.h Auto-merging src/network/tc/cake.c CONFLICT (add/add): Merge conflict in src/network/tc/cake.c Auto-merging src/network/org.freedesktop.network1.service CONFLICT (add/add): Merge conflict in src/network/org.freedesktop.network1.service Auto-merging src/network/org.freedesktop.network1.policy CONFLICT (add/add): Merge conflict in src/network/org.freedesktop.network1.policy Auto-merging src/network/networkd.c CONFLICT (add/add): Merge conflict in src/network/networkd.c Auto-merging src/network/networkd-wifi.h CONFLICT (add/add): Merge conflict in src/network/networkd-wifi.h Auto-merging src/network/networkd-wifi.c CONFLICT (add/add): Merge conflict in src/network/networkd-wifi.c Auto-merging src/network/networkd-util.h CONFLICT (add/add): Merge conflict in src/network/networkd-util.h Auto-merging src/network/networkd-util.c CONFLICT (add/add): Merge conflict in src/network/networkd-util.c Auto-merging src/network/networkd-speed-meter.h CONFLICT (add/add): Merge conflict in src/network/networkd-speed-meter.h Auto-merging src/network/networkd-speed-meter.c CONFLICT (add/add): Merge conflict in src/network/networkd-speed-meter.c Auto-merging src/network/networkd-routing-policy-rule.h CONFLICT (add/add): Merge conflict in src/network/networkd-routing-policy-rule.h Auto-merging src/network/networkd-routing-policy-rule.c CONFLICT (add/add): Merge conflict in src/network/networkd-routing-policy-rule.c Auto-merging src/network/networkd-route.h CONFLICT (add/add): Merge conflict in src/network/networkd-route.h Auto-merging src/network/networkd-route.c CONFLICT (add/add): Merge conflict in src/network/networkd-route.c Auto-merging src/network/networkd-radv.h CONFLICT (add/add): Merge conflict in src/network/networkd-radv.h Auto-merging src/network/networkd-radv.c CONFLICT (add/add): Merge conflict in src/network/networkd-radv.c Auto-merging src/network/networkd-nexthop.h CONFLICT (add/add): Merge conflict in src/network/networkd-nexthop.h Auto-merging src/network/networkd-nexthop.c CONFLICT (add/add): Merge conflict in src/network/networkd-nexthop.c Auto-merging src/network/networkd-network.h CONFLICT (add/add): Merge conflict in src/network/networkd-network.h Auto-merging src/network/networkd-network.c CONFLICT (add/add): Merge conflict in src/network/networkd-network.c Auto-merging src/network/networkd-network-gperf.gperf CONFLICT (add/add): Merge conflict in src/network/networkd-network-gperf.gperf Auto-merging src/network/networkd-network-bus.h CONFLICT (add/add): Merge conflict in src/network/networkd-network-bus.h Auto-merging src/network/networkd-network-bus.c CONFLICT (add/add): Merge conflict in src/network/networkd-network-bus.c Auto-merging src/network/networkd-neighbor.h CONFLICT (add/add): Merge conflict in src/network/networkd-neighbor.h Auto-merging src/network/networkd-neighbor.c CONFLICT (add/add): Merge conflict in src/network/networkd-neighbor.c Auto-merging src/network/networkd-ndisc.h CONFLICT (add/add): Merge conflict in src/network/networkd-ndisc.h Auto-merging src/network/networkd-ndisc.c CONFLICT (add/add): Merge conflict in src/network/networkd-ndisc.c Auto-merging src/network/networkd-manager.h CONFLICT (add/add): Merge conflict in src/network/networkd-manager.h Auto-merging src/network/networkd-manager.c CONFLICT (add/add): Merge conflict in src/network/networkd-manager.c Auto-merging src/network/networkd-manager-bus.h CONFLICT (add/add): Merge conflict in src/network/networkd-manager-bus.h Auto-merging src/network/networkd-manager-bus.c CONFLICT (add/add): Merge conflict in src/network/networkd-manager-bus.c Auto-merging src/network/networkd-lldp-tx.h CONFLICT (add/add): Merge conflict in src/network/networkd-lldp-tx.h Auto-merging src/network/networkd-lldp-tx.c CONFLICT (add/add): Merge conflict in src/network/networkd-lldp-tx.c Auto-merging src/network/networkd-lldp-rx.h CONFLICT (add/add): Merge conflict in src/network/networkd-lldp-rx.h Auto-merging src/network/networkd-lldp-rx.c CONFLICT (add/add): Merge conflict in src/network/networkd-lldp-rx.c Auto-merging src/network/networkd-link.h CONFLICT (add/add): Merge conflict in src/network/networkd-link.h Auto-merging src/network/networkd-link.c CONFLICT (add/add): Merge conflict in src/network/networkd-link.c Auto-merging src/network/networkd-link-bus.h CONFLICT (add/add): Merge conflict in src/network/networkd-link-bus.h Auto-merging src/network/networkd-link-bus.c CONFLICT (add/add): Merge conflict in src/network/networkd-link-bus.c Auto-merging src/network/networkd-ipv6-proxy-ndp.h CONFLICT (add/add): Merge conflict in src/network/networkd-ipv6-proxy-ndp.h Auto-merging src/network/networkd-ipv6-proxy-ndp.c CONFLICT (add/add): Merge conflict in src/network/networkd-ipv6-proxy-ndp.c Auto-merging src/network/networkd-ipv4ll.h CONFLICT (add/add): Merge conflict in src/network/networkd-ipv4ll.h Auto-merging src/network/networkd-ipv4ll.c CONFLICT (add/add): Merge conflict in src/network/networkd-ipv4ll.c Auto-merging src/network/networkd-fdb.h CONFLICT (add/add): Merge conflict in src/network/networkd-fdb.h Auto-merging src/network/networkd-fdb.c CONFLICT (add/add): Merge conflict in src/network/networkd-fdb.c Auto-merging src/network/networkd-dhcp6.h CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp6.h Auto-merging src/network/networkd-dhcp6.c CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp6.c Auto-merging src/network/networkd-dhcp4.h CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp4.h Auto-merging src/network/networkd-dhcp4.c CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp4.c Auto-merging src/network/networkd-dhcp-server.h CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp-server.h Auto-merging src/network/networkd-dhcp-server.c CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp-server.c Auto-merging src/network/networkd-dhcp-common.h CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp-common.h Auto-merging src/network/networkd-dhcp-common.c CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp-common.c Auto-merging src/network/networkd-conf.h CONFLICT (add/add): Merge conflict in src/network/networkd-conf.h Auto-merging src/network/networkd-conf.c CONFLICT (add/add): Merge conflict in src/network/networkd-conf.c Auto-merging src/network/networkd-can.h CONFLICT (add/add): Merge conflict in src/network/networkd-can.h Auto-merging src/network/networkd-can.c CONFLICT (add/add): Merge conflict in src/network/networkd-can.c Auto-merging src/network/networkd-brvlan.h CONFLICT (add/add): Merge conflict in src/network/networkd-brvlan.h Auto-merging src/network/networkd-brvlan.c CONFLICT (add/add): Merge conflict in src/network/networkd-brvlan.c Auto-merging src/network/networkd-address.h CONFLICT (add/add): Merge conflict in src/network/networkd-address.h Auto-merging src/network/networkd-address.c CONFLICT (add/add): Merge conflict in src/network/networkd-address.c Auto-merging src/network/networkd-address-pool.h CONFLICT (add/add): Merge conflict in src/network/networkd-address-pool.h Auto-merging src/network/networkd-address-pool.c CONFLICT (add/add): Merge conflict in src/network/networkd-address-pool.c Auto-merging src/network/networkd-address-label.h CONFLICT (add/add): Merge conflict in src/network/networkd-address-label.h Auto-merging src/network/networkd-address-label.c CONFLICT (add/add): Merge conflict in src/network/networkd-address-label.c Auto-merging src/network/networkctl.c CONFLICT (add/add): Merge conflict in src/network/networkctl.c Auto-merging src/network/netdev/xfrm.h CONFLICT (add/add): Merge conflict in src/network/netdev/xfrm.h Auto-merging src/network/netdev/xfrm.c CONFLICT (add/add): Merge conflict in src/network/netdev/xfrm.c Auto-merging src/network/netdev/wireguard.h CONFLICT (add/add): Merge conflict in src/network/netdev/wireguard.h Auto-merging src/network/netdev/wireguard.c CONFLICT (add/add): Merge conflict in src/network/netdev/wireguard.c Auto-merging src/network/netdev/vxlan.h CONFLICT (add/add): Merge conflict in src/network/netdev/vxlan.h Auto-merging src/network/netdev/vxlan.c CONFLICT (add/add): Merge conflict in src/network/netdev/vxlan.c Auto-merging src/network/netdev/vxcan.h CONFLICT (add/add): Merge conflict in src/network/netdev/vxcan.h Auto-merging src/network/netdev/vxcan.c CONFLICT (add/add): Merge conflict in src/network/netdev/vxcan.c Auto-merging src/network/netdev/vrf.h CONFLICT (add/add): Merge conflict in src/network/netdev/vrf.h Auto-merging src/network/netdev/vrf.c CONFLICT (add/add): Merge conflict in src/network/netdev/vrf.c Auto-merging src/network/netdev/vlan.h CONFLICT (add/add): Merge conflict in src/network/netdev/vlan.h Auto-merging src/network/netdev/vlan.c CONFLICT (add/add): Merge conflict in src/network/netdev/vlan.c Auto-merging src/network/netdev/veth.h CONFLICT (add/add): Merge conflict in src/network/netdev/veth.h Auto-merging src/network/netdev/veth.c CONFLICT (add/add): Merge conflict in src/network/netdev/veth.c Auto-merging src/network/netdev/vcan.h CONFLICT (add/add): Merge conflict in src/network/netdev/vcan.h Auto-merging src/network/netdev/vcan.c CONFLICT (add/add): Merge conflict in src/network/netdev/vcan.c Auto-merging src/network/netdev/tuntap.h CONFLICT (add/add): Merge conflict in src/network/netdev/tuntap.h Auto-merging src/network/netdev/tuntap.c CONFLICT (add/add): Merge conflict in src/network/netdev/tuntap.c Auto-merging src/network/netdev/tunnel.h CONFLICT (add/add): Merge conflict in src/network/netdev/tunnel.h Auto-merging src/network/netdev/tunnel.c CONFLICT (add/add): Merge conflict in src/network/netdev/tunnel.c Auto-merging src/network/netdev/nlmon.h CONFLICT (add/add): Merge conflict in src/network/netdev/nlmon.h Auto-merging src/network/netdev/nlmon.c CONFLICT (add/add): Merge conflict in src/network/netdev/nlmon.c Auto-merging src/network/netdev/netdevsim.h CONFLICT (add/add): Merge conflict in src/network/netdev/netdevsim.h Auto-merging src/network/netdev/netdevsim.c CONFLICT (add/add): Merge conflict in src/network/netdev/netdevsim.c Auto-merging src/network/netdev/netdev.h CONFLICT (add/add): Merge conflict in src/network/netdev/netdev.h Auto-merging src/network/netdev/netdev.c CONFLICT (add/add): Merge conflict in src/network/netdev/netdev.c Auto-merging src/network/netdev/netdev-gperf.gperf CONFLICT (add/add): Merge conflict in src/network/netdev/netdev-gperf.gperf Auto-merging src/network/netdev/macvlan.h CONFLICT (add/add): Merge conflict in src/network/netdev/macvlan.h Auto-merging src/network/netdev/macvlan.c CONFLICT (add/add): Merge conflict in src/network/netdev/macvlan.c Auto-merging src/network/netdev/macsec.h CONFLICT (add/add): Merge conflict in src/network/netdev/macsec.h Auto-merging src/network/netdev/macsec.c CONFLICT (add/add): Merge conflict in src/network/netdev/macsec.c Auto-merging src/network/netdev/l2tp-tunnel.h CONFLICT (add/add): Merge conflict in src/network/netdev/l2tp-tunnel.h Auto-merging src/network/netdev/l2tp-tunnel.c CONFLICT (add/add): Merge conflict in src/network/netdev/l2tp-tunnel.c Auto-merging src/network/netdev/ipvlan.h CONFLICT (add/add): Merge conflict in src/network/netdev/ipvlan.h Auto-merging src/network/netdev/ipvlan.c CONFLICT (add/add): Merge conflict in src/network/netdev/ipvlan.c Auto-merging src/network/netdev/ifb.h CONFLICT (add/add): Merge conflict in src/network/netdev/ifb.h Auto-merging src/network/netdev/ifb.c CONFLICT (add/add): Merge conflict in src/network/netdev/ifb.c Auto-merging src/network/netdev/geneve.h CONFLICT (add/add): Merge conflict in src/network/netdev/geneve.h Auto-merging src/network/netdev/geneve.c CONFLICT (add/add): Merge conflict in src/network/netdev/geneve.c Auto-merging src/network/netdev/fou-tunnel.h CONFLICT (add/add): Merge conflict in src/network/netdev/fou-tunnel.h Auto-merging src/network/netdev/fou-tunnel.c CONFLICT (add/add): Merge conflict in src/network/netdev/fou-tunnel.c Auto-merging src/network/netdev/dummy.h CONFLICT (add/add): Merge conflict in src/network/netdev/dummy.h Auto-merging src/network/netdev/dummy.c CONFLICT (add/add): Merge conflict in src/network/netdev/dummy.c Auto-merging src/network/netdev/bridge.h CONFLICT (add/add): Merge conflict in src/network/netdev/bridge.h Auto-merging src/network/netdev/bridge.c CONFLICT (add/add): Merge conflict in src/network/netdev/bridge.c Auto-merging src/network/netdev/bond.h CONFLICT (add/add): Merge conflict in src/network/netdev/bond.h Auto-merging src/network/netdev/bond.c CONFLICT (add/add): Merge conflict in src/network/netdev/bond.c Auto-merging src/network/meson.build CONFLICT (add/add): Merge conflict in src/network/meson.build Auto-merging src/network/generator/test-network-generator.c CONFLICT (add/add): Merge conflict in src/network/generator/test-network-generator.c Auto-merging src/network/generator/network-generator.h CONFLICT (add/add): Merge conflict in src/network/generator/network-generator.h Auto-merging src/network/generator/network-generator.c CONFLICT (add/add): Merge conflict in src/network/generator/network-generator.c Auto-merging src/network/generator/main.c CONFLICT (add/add): Merge conflict in src/network/generator/main.c Auto-merging src/network/fuzz-network-parser.c CONFLICT (add/add): Merge conflict in src/network/fuzz-network-parser.c Auto-merging src/network/fuzz-netdev-parser.c CONFLICT (add/add): Merge conflict in src/network/fuzz-netdev-parser.c Auto-merging src/mount/mount-tool.c CONFLICT (add/add): Merge conflict in src/mount/mount-tool.c Auto-merging src/modules-load/modules-load.c CONFLICT (add/add): Merge conflict in src/modules-load/modules-load.c Auto-merging src/machine/test-machine-tables.c CONFLICT (add/add): Merge conflict in src/machine/test-machine-tables.c Auto-merging src/machine/org.freedesktop.machine1.service CONFLICT (add/add): Merge conflict in src/machine/org.freedesktop.machine1.service Auto-merging src/machine/org.freedesktop.machine1.policy CONFLICT (add/add): Merge conflict in src/machine/org.freedesktop.machine1.policy Auto-merging src/machine/operation.h CONFLICT (add/add): Merge conflict in src/machine/operation.h Auto-merging src/machine/operation.c CONFLICT (add/add): Merge conflict in src/machine/operation.c Auto-merging src/machine/meson.build CONFLICT (add/add): Merge conflict in src/machine/meson.build Auto-merging src/machine/machined.h CONFLICT (add/add): Merge conflict in src/machine/machined.h Auto-merging src/machine/machined.c CONFLICT (add/add): Merge conflict in src/machine/machined.c Auto-merging src/machine/machined-dbus.c CONFLICT (add/add): Merge conflict in src/machine/machined-dbus.c Auto-merging src/machine/machined-core.c CONFLICT (add/add): Merge conflict in src/machine/machined-core.c Auto-merging src/machine/machinectl.c CONFLICT (add/add): Merge conflict in src/machine/machinectl.c Auto-merging src/machine/machine.h CONFLICT (add/add): Merge conflict in src/machine/machine.h Auto-merging src/machine/machine.c CONFLICT (add/add): Merge conflict in src/machine/machine.c Auto-merging src/machine/machine-dbus.h CONFLICT (add/add): Merge conflict in src/machine/machine-dbus.h Auto-merging src/machine/machine-dbus.c CONFLICT (add/add): Merge conflict in src/machine/machine-dbus.c Auto-merging src/machine/image-dbus.h CONFLICT (add/add): Merge conflict in src/machine/image-dbus.h Auto-merging src/machine/image-dbus.c CONFLICT (add/add): Merge conflict in src/machine/image-dbus.c Auto-merging src/machine-id-setup/machine-id-setup-main.c CONFLICT (add/add): Merge conflict in src/machine-id-setup/machine-id-setup-main.c Auto-merging src/login/user-runtime-dir.c CONFLICT (add/add): Merge conflict in src/login/user-runtime-dir.c Auto-merging src/login/test-login-tables.c CONFLICT (add/add): Merge conflict in src/login/test-login-tables.c Auto-merging src/login/test-login-shared.c CONFLICT (add/add): Merge conflict in src/login/test-login-shared.c Auto-merging src/login/test-inhibit.c CONFLICT (add/add): Merge conflict in src/login/test-inhibit.c Auto-merging src/login/sysfs-show.h CONFLICT (add/add): Merge conflict in src/login/sysfs-show.h Auto-merging src/login/sysfs-show.c CONFLICT (add/add): Merge conflict in src/login/sysfs-show.c Auto-merging src/login/pam_systemd.sym CONFLICT (add/add): Merge conflict in src/login/pam_systemd.sym Auto-merging src/login/pam_systemd.c CONFLICT (add/add): Merge conflict in src/login/pam_systemd.c Auto-merging src/login/org.freedesktop.login1.service CONFLICT (add/add): Merge conflict in src/login/org.freedesktop.login1.service Auto-merging src/login/org.freedesktop.login1.policy CONFLICT (add/add): Merge conflict in src/login/org.freedesktop.login1.policy Auto-merging src/login/org.freedesktop.login1.conf CONFLICT (add/add): Merge conflict in src/login/org.freedesktop.login1.conf Auto-merging src/login/meson.build CONFLICT (add/add): Merge conflict in src/login/meson.build Auto-merging src/login/logind.h CONFLICT (add/add): Merge conflict in src/login/logind.h Auto-merging src/login/logind.conf.in CONFLICT (add/add): Merge conflict in src/login/logind.conf.in Auto-merging src/login/logind.c CONFLICT (add/add): Merge conflict in src/login/logind.c Auto-merging src/login/logind-utmp.c CONFLICT (add/add): Merge conflict in src/login/logind-utmp.c Auto-merging src/login/logind-user.h CONFLICT (add/add): Merge conflict in src/login/logind-user.h Auto-merging src/login/logind-user.c CONFLICT (add/add): Merge conflict in src/login/logind-user.c Auto-merging src/login/logind-user-dbus.h CONFLICT (add/add): Merge conflict in src/login/logind-user-dbus.h Auto-merging src/login/logind-user-dbus.c CONFLICT (add/add): Merge conflict in src/login/logind-user-dbus.c Auto-merging src/login/logind-session.h CONFLICT (add/add): Merge conflict in src/login/logind-session.h Auto-merging src/login/logind-session.c CONFLICT (add/add): Merge conflict in src/login/logind-session.c Auto-merging src/login/logind-session-device.h CONFLICT (add/add): Merge conflict in src/login/logind-session-device.h Auto-merging src/login/logind-session-device.c CONFLICT (add/add): Merge conflict in src/login/logind-session-device.c Auto-merging src/login/logind-session-dbus.h CONFLICT (add/add): Merge conflict in src/login/logind-session-dbus.h Auto-merging src/login/logind-session-dbus.c CONFLICT (add/add): Merge conflict in src/login/logind-session-dbus.c Auto-merging src/login/logind-seat.h CONFLICT (add/add): Merge conflict in src/login/logind-seat.h Auto-merging src/login/logind-seat.c CONFLICT (add/add): Merge conflict in src/login/logind-seat.c Auto-merging src/login/logind-seat-dbus.h CONFLICT (add/add): Merge conflict in src/login/logind-seat-dbus.h Auto-merging src/login/logind-seat-dbus.c CONFLICT (add/add): Merge conflict in src/login/logind-seat-dbus.c Auto-merging src/login/logind-inhibit.h CONFLICT (add/add): Merge conflict in src/login/logind-inhibit.h Auto-merging src/login/logind-inhibit.c CONFLICT (add/add): Merge conflict in src/login/logind-inhibit.c Auto-merging src/login/logind-gperf.gperf CONFLICT (add/add): Merge conflict in src/login/logind-gperf.gperf Auto-merging src/login/logind-device.h CONFLICT (add/add): Merge conflict in src/login/logind-device.h Auto-merging src/login/logind-device.c CONFLICT (add/add): Merge conflict in src/login/logind-device.c Auto-merging src/login/logind-dbus.h CONFLICT (add/add): Merge conflict in src/login/logind-dbus.h Auto-merging src/login/logind-dbus.c CONFLICT (add/add): Merge conflict in src/login/logind-dbus.c Auto-merging src/login/logind-core.c CONFLICT (add/add): Merge conflict in src/login/logind-core.c Auto-merging src/login/logind-button.h CONFLICT (add/add): Merge conflict in src/login/logind-button.h Auto-merging src/login/logind-button.c CONFLICT (add/add): Merge conflict in src/login/logind-button.c Auto-merging src/login/logind-brightness.h CONFLICT (add/add): Merge conflict in src/login/logind-brightness.h Auto-merging src/login/logind-brightness.c CONFLICT (add/add): Merge conflict in src/login/logind-brightness.c Auto-merging src/login/logind-action.h CONFLICT (add/add): Merge conflict in src/login/logind-action.h Auto-merging src/login/logind-action.c CONFLICT (add/add): Merge conflict in src/login/logind-action.c Auto-merging src/login/logind-acl.h CONFLICT (add/add): Merge conflict in src/login/logind-acl.h Auto-merging src/login/logind-acl.c CONFLICT (add/add): Merge conflict in src/login/logind-acl.c Auto-merging src/login/loginctl.c CONFLICT (add/add): Merge conflict in src/login/loginctl.c Auto-merging src/login/inhibit.c CONFLICT (add/add): Merge conflict in src/login/inhibit.c Auto-merging src/login/73-seat-late.rules.m4 CONFLICT (add/add): Merge conflict in src/login/73-seat-late.rules.m4 Auto-merging src/login/71-seat.rules.in CONFLICT (add/add): Merge conflict in src/login/71-seat.rules.in Auto-merging src/login/70-uaccess.rules.m4 CONFLICT (add/add): Merge conflict in src/login/70-uaccess.rules.m4 Auto-merging src/login/70-power-switch.rules CONFLICT (add/add): Merge conflict in src/login/70-power-switch.rules Auto-merging src/locale/test-keymap-util.c CONFLICT (add/add): Merge conflict in src/locale/test-keymap-util.c Auto-merging src/locale/org.freedesktop.locale1.service CONFLICT (add/add): Merge conflict in src/locale/org.freedesktop.locale1.service Auto-merging src/locale/org.freedesktop.locale1.policy CONFLICT (add/add): Merge conflict in src/locale/org.freedesktop.locale1.policy Auto-merging src/locale/org.freedesktop.locale1.conf CONFLICT (add/add): Merge conflict in src/locale/org.freedesktop.locale1.conf Auto-merging src/locale/meson.build CONFLICT (add/add): Merge conflict in src/locale/meson.build Auto-merging src/locale/localed.c CONFLICT (add/add): Merge conflict in src/locale/localed.c Auto-merging src/locale/localectl.c CONFLICT (add/add): Merge conflict in src/locale/localectl.c Auto-merging src/locale/keymap-util.h CONFLICT (add/add): Merge conflict in src/locale/keymap-util.h Auto-merging src/locale/keymap-util.c CONFLICT (add/add): Merge conflict in src/locale/keymap-util.c Auto-merging src/libudev/meson.build CONFLICT (add/add): Merge conflict in src/libudev/meson.build Auto-merging src/libudev/libudev.sym CONFLICT (add/add): Merge conflict in src/libudev/libudev.sym Auto-merging src/libudev/libudev.pc.in CONFLICT (add/add): Merge conflict in src/libudev/libudev.pc.in Auto-merging src/libudev/libudev.h CONFLICT (add/add): Merge conflict in src/libudev/libudev.h Auto-merging src/libudev/libudev.c CONFLICT (add/add): Merge conflict in src/libudev/libudev.c Auto-merging src/libudev/libudev-util.h CONFLICT (add/add): Merge conflict in src/libudev/libudev-util.h Auto-merging src/libudev/libudev-util.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-util.c Auto-merging src/libudev/libudev-queue.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-queue.c Auto-merging src/libudev/libudev-monitor.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-monitor.c Auto-merging src/libudev/libudev-list.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-list.c Auto-merging src/libudev/libudev-list-internal.h CONFLICT (add/add): Merge conflict in src/libudev/libudev-list-internal.h Auto-merging src/libudev/libudev-hwdb.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-hwdb.c Auto-merging src/libudev/libudev-enumerate.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-enumerate.c Auto-merging src/libudev/libudev-device.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-device.c Auto-merging src/libudev/libudev-device-internal.h CONFLICT (add/add): Merge conflict in src/libudev/libudev-device-internal.h Auto-merging src/libsystemd/sd-utf8/sd-utf8.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-utf8/sd-utf8.c Auto-merging src/libsystemd/sd-resolve/test-resolve.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-resolve/test-resolve.c Auto-merging src/libsystemd/sd-resolve/sd-resolve.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-resolve/sd-resolve.c Auto-merging src/libsystemd/sd-resolve/resolve-private.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-resolve/resolve-private.h Auto-merging src/libsystemd/sd-path/sd-path.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-path/sd-path.c Auto-merging src/libsystemd/sd-network/sd-network.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-network/sd-network.c Auto-merging src/libsystemd/sd-network/network-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-network/network-util.h Auto-merging src/libsystemd/sd-network/network-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-network/network-util.c Auto-merging src/libsystemd/sd-netlink/test-netlink.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/test-netlink.c Auto-merging src/libsystemd/sd-netlink/sd-netlink.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/sd-netlink.c Auto-merging src/libsystemd/sd-netlink/rtnl-message.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/rtnl-message.c Auto-merging src/libsystemd/sd-netlink/netlink-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-util.h Auto-merging src/libsystemd/sd-netlink/netlink-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-util.c Auto-merging src/libsystemd/sd-netlink/netlink-types.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-types.h Auto-merging src/libsystemd/sd-netlink/netlink-types.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-types.c Auto-merging src/libsystemd/sd-netlink/netlink-socket.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-socket.c Auto-merging src/libsystemd/sd-netlink/netlink-slot.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-slot.h Auto-merging src/libsystemd/sd-netlink/netlink-slot.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-slot.c Auto-merging src/libsystemd/sd-netlink/netlink-message.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-message.c Auto-merging src/libsystemd/sd-netlink/netlink-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-internal.h Auto-merging src/libsystemd/sd-netlink/generic-netlink.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/generic-netlink.h Auto-merging src/libsystemd/sd-netlink/generic-netlink.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/generic-netlink.c Auto-merging src/libsystemd/sd-login/test-login.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-login/test-login.c Auto-merging src/libsystemd/sd-login/sd-login.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-login/sd-login.c Auto-merging src/libsystemd/sd-id128/sd-id128.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-id128/sd-id128.c Auto-merging src/libsystemd/sd-id128/id128-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-id128/id128-util.h Auto-merging src/libsystemd/sd-id128/id128-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-id128/id128-util.c Auto-merging src/libsystemd/sd-hwdb/sd-hwdb.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-hwdb/sd-hwdb.c Auto-merging src/libsystemd/sd-hwdb/hwdb-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-hwdb/hwdb-util.h Auto-merging src/libsystemd/sd-hwdb/hwdb-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-hwdb/hwdb-util.c Auto-merging src/libsystemd/sd-hwdb/hwdb-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-hwdb/hwdb-internal.h Auto-merging src/libsystemd/sd-event/test-event.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/test-event.c Auto-merging src/libsystemd/sd-event/sd-event.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/sd-event.c Auto-merging src/libsystemd/sd-event/event-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/event-util.h Auto-merging src/libsystemd/sd-event/event-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/event-util.c Auto-merging src/libsystemd/sd-event/event-source.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/event-source.h Auto-merging src/libsystemd/sd-device/test-udev-device-thread.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/test-udev-device-thread.c Auto-merging src/libsystemd/sd-device/test-sd-device.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/test-sd-device.c Auto-merging src/libsystemd/sd-device/test-sd-device-thread.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/test-sd-device-thread.c Auto-merging src/libsystemd/sd-device/test-sd-device-monitor.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/test-sd-device-monitor.c Auto-merging src/libsystemd/sd-device/sd-device.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/sd-device.c Auto-merging src/libsystemd/sd-device/device-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-util.h Auto-merging src/libsystemd/sd-device/device-private.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-private.h Auto-merging src/libsystemd/sd-device/device-private.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-private.c Auto-merging src/libsystemd/sd-device/device-monitor.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-monitor.c Auto-merging src/libsystemd/sd-device/device-monitor-private.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-monitor-private.h Auto-merging src/libsystemd/sd-device/device-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-internal.h Auto-merging src/libsystemd/sd-device/device-enumerator.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-enumerator.c Auto-merging src/libsystemd/sd-device/device-enumerator-private.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-enumerator-private.h Auto-merging src/libsystemd/sd-daemon/sd-daemon.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-daemon/sd-daemon.c Auto-merging src/libsystemd/sd-bus/test-vtable-data.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-vtable-data.h Auto-merging src/libsystemd/sd-bus/test-bus-watch-bind.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-watch-bind.c Auto-merging src/libsystemd/sd-bus/test-bus-vtable.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-vtable.c Auto-merging src/libsystemd/sd-bus/test-bus-track.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-track.c Auto-merging src/libsystemd/sd-bus/test-bus-signature.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-signature.c Auto-merging src/libsystemd/sd-bus/test-bus-server.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-server.c Auto-merging src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c Auto-merging src/libsystemd/sd-bus/test-bus-objects.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-objects.c Auto-merging src/libsystemd/sd-bus/test-bus-match.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-match.c Auto-merging src/libsystemd/sd-bus/test-bus-marshal.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-marshal.c Auto-merging src/libsystemd/sd-bus/test-bus-introspect.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-introspect.c Auto-merging src/libsystemd/sd-bus/test-bus-gvariant.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-gvariant.c Auto-merging src/libsystemd/sd-bus/test-bus-error.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-error.c Auto-merging src/libsystemd/sd-bus/test-bus-creds.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-creds.c Auto-merging src/libsystemd/sd-bus/test-bus-cleanup.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-cleanup.c Auto-merging src/libsystemd/sd-bus/test-bus-chat.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-chat.c Auto-merging src/libsystemd/sd-bus/test-bus-benchmark.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-benchmark.c Auto-merging src/libsystemd/sd-bus/test-bus-address.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-address.c Auto-merging src/libsystemd/sd-bus/sd-bus.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/sd-bus.c Auto-merging src/libsystemd/sd-bus/bus-type.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-type.h Auto-merging src/libsystemd/sd-bus/bus-type.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-type.c Auto-merging src/libsystemd/sd-bus/bus-track.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-track.h Auto-merging src/libsystemd/sd-bus/bus-track.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-track.c Auto-merging src/libsystemd/sd-bus/bus-socket.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-socket.h Auto-merging src/libsystemd/sd-bus/bus-socket.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-socket.c Auto-merging src/libsystemd/sd-bus/bus-slot.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-slot.h Auto-merging src/libsystemd/sd-bus/bus-slot.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-slot.c Auto-merging src/libsystemd/sd-bus/bus-signature.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-signature.h Auto-merging src/libsystemd/sd-bus/bus-signature.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-signature.c Auto-merging src/libsystemd/sd-bus/bus-protocol.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-protocol.h Auto-merging src/libsystemd/sd-bus/bus-objects.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-objects.h Auto-merging src/libsystemd/sd-bus/bus-objects.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-objects.c Auto-merging src/libsystemd/sd-bus/bus-message.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-message.h Auto-merging src/libsystemd/sd-bus/bus-message.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-message.c Auto-merging src/libsystemd/sd-bus/bus-match.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-match.h Auto-merging src/libsystemd/sd-bus/bus-match.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-match.c Auto-merging src/libsystemd/sd-bus/bus-kernel.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-kernel.h Auto-merging src/libsystemd/sd-bus/bus-kernel.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-kernel.c Auto-merging src/libsystemd/sd-bus/bus-introspect.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-introspect.h Auto-merging src/libsystemd/sd-bus/bus-introspect.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-introspect.c Auto-merging src/libsystemd/sd-bus/bus-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-internal.h Auto-merging src/libsystemd/sd-bus/bus-internal.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-internal.c Auto-merging src/libsystemd/sd-bus/bus-gvariant.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-gvariant.h Auto-merging src/libsystemd/sd-bus/bus-gvariant.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-gvariant.c Auto-merging src/libsystemd/sd-bus/bus-error.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-error.h Auto-merging src/libsystemd/sd-bus/bus-error.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-error.c Auto-merging src/libsystemd/sd-bus/bus-dump.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-dump.h Auto-merging src/libsystemd/sd-bus/bus-dump.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-dump.c Auto-merging src/libsystemd/sd-bus/bus-creds.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-creds.h Auto-merging src/libsystemd/sd-bus/bus-creds.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-creds.c Auto-merging src/libsystemd/sd-bus/bus-convenience.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-convenience.c Auto-merging src/libsystemd/sd-bus/bus-control.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-control.h Auto-merging src/libsystemd/sd-bus/bus-control.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-control.c Auto-merging src/libsystemd/sd-bus/bus-container.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-container.h Auto-merging src/libsystemd/sd-bus/bus-container.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-container.c Auto-merging src/libsystemd/sd-bus/bus-common-errors.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-common-errors.h Auto-merging src/libsystemd/sd-bus/bus-common-errors.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-common-errors.c Auto-merging src/libsystemd/meson.build CONFLICT (add/add): Merge conflict in src/libsystemd/meson.build Auto-merging src/libsystemd/libsystemd.sym CONFLICT (add/add): Merge conflict in src/libsystemd/libsystemd.sym Auto-merging src/libsystemd/libsystemd.pc.in CONFLICT (add/add): Merge conflict in src/libsystemd/libsystemd.pc.in Auto-merging src/libsystemd/disable-mempool.c CONFLICT (add/add): Merge conflict in src/libsystemd/disable-mempool.c Auto-merging src/libsystemd-network/test-sd-dhcp-lease.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-sd-dhcp-lease.c Auto-merging src/libsystemd-network/test-ndisc-rs.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-ndisc-rs.c Auto-merging src/libsystemd-network/test-ndisc-ra.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-ndisc-ra.c Auto-merging src/libsystemd-network/test-lldp.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-lldp.c Auto-merging src/libsystemd-network/test-ipv4ll.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-ipv4ll.c Auto-merging src/libsystemd-network/test-ipv4ll-manual.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-ipv4ll-manual.c Auto-merging src/libsystemd-network/test-dhcp6-client.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-dhcp6-client.c Auto-merging src/libsystemd-network/test-dhcp-server.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-dhcp-server.c Auto-merging src/libsystemd-network/test-dhcp-option.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-dhcp-option.c Auto-merging src/libsystemd-network/test-dhcp-client.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-dhcp-client.c Auto-merging src/libsystemd-network/test-acd.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-acd.c Auto-merging src/libsystemd-network/sd-radv.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-radv.c Auto-merging src/libsystemd-network/sd-ndisc.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-ndisc.c Auto-merging src/libsystemd-network/sd-lldp.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-lldp.c Auto-merging src/libsystemd-network/sd-ipv4ll.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-ipv4ll.c Auto-merging src/libsystemd-network/sd-ipv4acd.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-ipv4acd.c Auto-merging src/libsystemd-network/sd-dhcp6-lease.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp6-lease.c Auto-merging src/libsystemd-network/sd-dhcp6-client.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp6-client.c Auto-merging src/libsystemd-network/sd-dhcp-server.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp-server.c Auto-merging src/libsystemd-network/sd-dhcp-lease.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp-lease.c Auto-merging src/libsystemd-network/sd-dhcp-client.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp-client.c Auto-merging src/libsystemd-network/radv-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/radv-internal.h Auto-merging src/libsystemd-network/network-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/network-internal.h Auto-merging src/libsystemd-network/network-internal.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/network-internal.c Auto-merging src/libsystemd-network/ndisc-router.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/ndisc-router.h Auto-merging src/libsystemd-network/ndisc-router.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/ndisc-router.c Auto-merging src/libsystemd-network/ndisc-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/ndisc-internal.h Auto-merging src/libsystemd-network/meson.build CONFLICT (add/add): Merge conflict in src/libsystemd-network/meson.build Auto-merging src/libsystemd-network/lldp-network.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-network.h Auto-merging src/libsystemd-network/lldp-network.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-network.c Auto-merging src/libsystemd-network/lldp-neighbor.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-neighbor.h Auto-merging src/libsystemd-network/lldp-neighbor.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-neighbor.c Auto-merging src/libsystemd-network/lldp-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-internal.h Auto-merging src/libsystemd-network/icmp6-util.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/icmp6-util.h Auto-merging src/libsystemd-network/icmp6-util.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/icmp6-util.c Auto-merging src/libsystemd-network/dhcp6-protocol.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-protocol.h Auto-merging src/libsystemd-network/dhcp6-option.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-option.c Auto-merging src/libsystemd-network/dhcp6-network.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-network.c Auto-merging src/libsystemd-network/dhcp6-lease-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-lease-internal.h Auto-merging src/libsystemd-network/dhcp6-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-internal.h Auto-merging src/libsystemd-network/dhcp-server-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-server-internal.h Auto-merging src/libsystemd-network/dhcp-protocol.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-protocol.h Auto-merging src/libsystemd-network/dhcp-packet.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-packet.c Auto-merging src/libsystemd-network/dhcp-option.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-option.c Auto-merging src/libsystemd-network/dhcp-network.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-network.c Auto-merging src/libsystemd-network/dhcp-lease-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-lease-internal.h Auto-merging src/libsystemd-network/dhcp-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-internal.h Auto-merging src/libsystemd-network/dhcp-identifier.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-identifier.h Auto-merging src/libsystemd-network/dhcp-identifier.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-identifier.c Auto-merging src/libsystemd-network/dhcp-client-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-client-internal.h Auto-merging src/libsystemd-network/arp-util.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/arp-util.h Auto-merging src/libsystemd-network/arp-util.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/arp-util.c Auto-merging src/kernel-install/meson.build CONFLICT (add/add): Merge conflict in src/kernel-install/meson.build Auto-merging src/kernel-install/kernel-install CONFLICT (add/add): Merge conflict in src/kernel-install/kernel-install Auto-merging src/kernel-install/90-loaderentry.install CONFLICT (add/add): Merge conflict in src/kernel-install/90-loaderentry.install Auto-merging src/journal/test-mmap-cache.c CONFLICT (add/add): Merge conflict in src/journal/test-mmap-cache.c Auto-merging src/journal/test-journal.c CONFLICT (add/add): Merge conflict in src/journal/test-journal.c Auto-merging src/journal/test-journal-verify.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-verify.c Auto-merging src/journal/test-journal-syslog.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-syslog.c Auto-merging src/journal/test-journal-stream.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-stream.c Auto-merging src/journal/test-journal-send.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-send.c Auto-merging src/journal/test-journal-match.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-match.c Auto-merging src/journal/test-journal-interleaving.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-interleaving.c Auto-merging src/journal/test-journal-init.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-init.c Auto-merging src/journal/test-journal-flush.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-flush.c Auto-merging src/journal/test-journal-enum.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-enum.c Auto-merging src/journal/test-journal-config.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-config.c Auto-merging src/journal/test-compress.c CONFLICT (add/add): Merge conflict in src/journal/test-compress.c Auto-merging src/journal/test-compress-benchmark.c CONFLICT (add/add): Merge conflict in src/journal/test-compress-benchmark.c Auto-merging src/journal/test-catalog.c CONFLICT (add/add): Merge conflict in src/journal/test-catalog.c Auto-merging src/journal/test-audit-type.c CONFLICT (add/add): Merge conflict in src/journal/test-audit-type.c Auto-merging src/journal/sd-journal.c CONFLICT (add/add): Merge conflict in src/journal/sd-journal.c Auto-merging src/journal/mmap-cache.h CONFLICT (add/add): Merge conflict in src/journal/mmap-cache.h Auto-merging src/journal/mmap-cache.c CONFLICT (add/add): Merge conflict in src/journal/mmap-cache.c Auto-merging src/journal/meson.build CONFLICT (add/add): Merge conflict in src/journal/meson.build Auto-merging src/journal/lookup3.h CONFLICT (add/add): Merge conflict in src/journal/lookup3.h Auto-merging src/journal/lookup3.c CONFLICT (add/add): Merge conflict in src/journal/lookup3.c Auto-merging src/journal/journald.conf CONFLICT (add/add): Merge conflict in src/journal/journald.conf Auto-merging src/journal/journald.c CONFLICT (add/add): Merge conflict in src/journal/journald.c Auto-merging src/journal/journald-wall.h CONFLICT (add/add): Merge conflict in src/journal/journald-wall.h Auto-merging src/journal/journald-wall.c CONFLICT (add/add): Merge conflict in src/journal/journald-wall.c Auto-merging src/journal/journald-syslog.h CONFLICT (add/add): Merge conflict in src/journal/journald-syslog.h Auto-merging src/journal/journald-syslog.c CONFLICT (add/add): Merge conflict in src/journal/journald-syslog.c Auto-merging src/journal/journald-stream.h CONFLICT (add/add): Merge conflict in src/journal/journald-stream.h Auto-merging src/journal/journald-stream.c CONFLICT (add/add): Merge conflict in src/journal/journald-stream.c Auto-merging src/journal/journald-server.h CONFLICT (add/add): Merge conflict in src/journal/journald-server.h Auto-merging src/journal/journald-server.c CONFLICT (add/add): Merge conflict in src/journal/journald-server.c Auto-merging src/journal/journald-rate-limit.h CONFLICT (add/add): Merge conflict in src/journal/journald-rate-limit.h Auto-merging src/journal/journald-rate-limit.c CONFLICT (add/add): Merge conflict in src/journal/journald-rate-limit.c Auto-merging src/journal/journald-native.h CONFLICT (add/add): Merge conflict in src/journal/journald-native.h Auto-merging src/journal/journald-native.c CONFLICT (add/add): Merge conflict in src/journal/journald-native.c Auto-merging src/journal/journald-kmsg.h CONFLICT (add/add): Merge conflict in src/journal/journald-kmsg.h Auto-merging src/journal/journald-kmsg.c CONFLICT (add/add): Merge conflict in src/journal/journald-kmsg.c Auto-merging src/journal/journald-context.h CONFLICT (add/add): Merge conflict in src/journal/journald-context.h Auto-merging src/journal/journald-context.c CONFLICT (add/add): Merge conflict in src/journal/journald-context.c Auto-merging src/journal/journald-console.h CONFLICT (add/add): Merge conflict in src/journal/journald-console.h Auto-merging src/journal/journald-console.c CONFLICT (add/add): Merge conflict in src/journal/journald-console.c Auto-merging src/journal/journald-audit.h CONFLICT (add/add): Merge conflict in src/journal/journald-audit.h Auto-merging src/journal/journald-audit.c CONFLICT (add/add): Merge conflict in src/journal/journald-audit.c Auto-merging src/journal/journalctl.c CONFLICT (add/add): Merge conflict in src/journal/journalctl.c Auto-merging src/journal/journal-verify.h CONFLICT (add/add): Merge conflict in src/journal/journal-verify.h Auto-merging src/journal/journal-verify.c CONFLICT (add/add): Merge conflict in src/journal/journal-verify.c Auto-merging src/journal/journal-vacuum.h CONFLICT (add/add): Merge conflict in src/journal/journal-vacuum.h Auto-merging src/journal/journal-vacuum.c CONFLICT (add/add): Merge conflict in src/journal/journal-vacuum.c Auto-merging src/journal/journal-send.c CONFLICT (add/add): Merge conflict in src/journal/journal-send.c Auto-merging src/journal/journal-internal.h CONFLICT (add/add): Merge conflict in src/journal/journal-internal.h Auto-merging src/journal/journal-file.h CONFLICT (add/add): Merge conflict in src/journal/journal-file.h Auto-merging src/journal/journal-file.c CONFLICT (add/add): Merge conflict in src/journal/journal-file.c Auto-merging src/journal/journal-def.h CONFLICT (add/add): Merge conflict in src/journal/journal-def.h Auto-merging src/journal/journal-authenticate.h CONFLICT (add/add): Merge conflict in src/journal/journal-authenticate.h Auto-merging src/journal/journal-authenticate.c CONFLICT (add/add): Merge conflict in src/journal/journal-authenticate.c Auto-merging src/journal/fsprg.h CONFLICT (add/add): Merge conflict in src/journal/fsprg.h Auto-merging src/journal/fsprg.c CONFLICT (add/add): Merge conflict in src/journal/fsprg.c Auto-merging src/journal/compress.h CONFLICT (add/add): Merge conflict in src/journal/compress.h Auto-merging src/journal/compress.c CONFLICT (add/add): Merge conflict in src/journal/compress.c Auto-merging src/journal/catalog.h CONFLICT (add/add): Merge conflict in src/journal/catalog.h Auto-merging src/journal/catalog.c CONFLICT (add/add): Merge conflict in src/journal/catalog.c Auto-merging src/journal/cat.c CONFLICT (add/add): Merge conflict in src/journal/cat.c Auto-merging src/journal/audit-type.h CONFLICT (add/add): Merge conflict in src/journal/audit-type.h Auto-merging src/journal/audit-type.c CONFLICT (add/add): Merge conflict in src/journal/audit-type.c Auto-merging src/journal-remote/microhttpd-util.h CONFLICT (add/add): Merge conflict in src/journal-remote/microhttpd-util.h Auto-merging src/journal-remote/microhttpd-util.c CONFLICT (add/add): Merge conflict in src/journal-remote/microhttpd-util.c Auto-merging src/journal-remote/meson.build CONFLICT (add/add): Merge conflict in src/journal-remote/meson.build Auto-merging src/journal-remote/journal-upload.h CONFLICT (add/add): Merge conflict in src/journal-remote/journal-upload.h Auto-merging src/journal-remote/journal-upload.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-upload.c Auto-merging src/journal-remote/journal-upload-journal.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-upload-journal.c Auto-merging src/journal-remote/journal-remote.h CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote.h Auto-merging src/journal-remote/journal-remote.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote.c Auto-merging src/journal-remote/journal-remote-write.h CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-write.h Auto-merging src/journal-remote/journal-remote-write.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-write.c Auto-merging src/journal-remote/journal-remote-parse.h CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-parse.h Auto-merging src/journal-remote/journal-remote-parse.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-parse.c Auto-merging src/journal-remote/journal-remote-main.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-main.c Auto-merging src/journal-remote/journal-gatewayd.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-gatewayd.c Auto-merging src/initctl/initctl.c CONFLICT (add/add): Merge conflict in src/initctl/initctl.c Auto-merging src/import/test-qcow2.c CONFLICT (add/add): Merge conflict in src/import/test-qcow2.c Auto-merging src/import/qcow2-util.h CONFLICT (add/add): Merge conflict in src/import/qcow2-util.h Auto-merging src/import/qcow2-util.c CONFLICT (add/add): Merge conflict in src/import/qcow2-util.c Auto-merging src/import/pull.c CONFLICT (add/add): Merge conflict in src/import/pull.c Auto-merging src/import/pull-tar.h CONFLICT (add/add): Merge conflict in src/import/pull-tar.h Auto-merging src/import/pull-tar.c CONFLICT (add/add): Merge conflict in src/import/pull-tar.c Auto-merging src/import/pull-raw.h CONFLICT (add/add): Merge conflict in src/import/pull-raw.h Auto-merging src/import/pull-raw.c CONFLICT (add/add): Merge conflict in src/import/pull-raw.c Auto-merging src/import/pull-job.h CONFLICT (add/add): Merge conflict in src/import/pull-job.h Auto-merging src/import/pull-job.c CONFLICT (add/add): Merge conflict in src/import/pull-job.c Auto-merging src/import/pull-common.h CONFLICT (add/add): Merge conflict in src/import/pull-common.h Auto-merging src/import/pull-common.c CONFLICT (add/add): Merge conflict in src/import/pull-common.c Auto-merging src/import/org.freedesktop.import1.service CONFLICT (add/add): Merge conflict in src/import/org.freedesktop.import1.service Auto-merging src/import/org.freedesktop.import1.policy CONFLICT (add/add): Merge conflict in src/import/org.freedesktop.import1.policy Auto-merging src/import/org.freedesktop.import1.conf CONFLICT (add/add): Merge conflict in src/import/org.freedesktop.import1.conf Auto-merging src/import/meson.build CONFLICT (add/add): Merge conflict in src/import/meson.build Auto-merging src/import/importd.c CONFLICT (add/add): Merge conflict in src/import/importd.c Auto-merging src/import/import.c CONFLICT (add/add): Merge conflict in src/import/import.c Auto-merging src/import/import-tar.h CONFLICT (add/add): Merge conflict in src/import/import-tar.h Auto-merging src/import/import-tar.c CONFLICT (add/add): Merge conflict in src/import/import-tar.c Auto-merging src/import/import-raw.h CONFLICT (add/add): Merge conflict in src/import/import-raw.h Auto-merging src/import/import-raw.c CONFLICT (add/add): Merge conflict in src/import/import-raw.c Auto-merging src/import/import-fs.c CONFLICT (add/add): Merge conflict in src/import/import-fs.c Auto-merging src/import/import-compress.h CONFLICT (add/add): Merge conflict in src/import/import-compress.h Auto-merging src/import/import-compress.c CONFLICT (add/add): Merge conflict in src/import/import-compress.c Auto-merging src/import/import-common.h CONFLICT (add/add): Merge conflict in src/import/import-common.h Auto-merging src/import/import-common.c CONFLICT (add/add): Merge conflict in src/import/import-common.c Auto-merging src/import/export.c CONFLICT (add/add): Merge conflict in src/import/export.c Auto-merging src/import/export-tar.h CONFLICT (add/add): Merge conflict in src/import/export-tar.h Auto-merging src/import/export-tar.c CONFLICT (add/add): Merge conflict in src/import/export-tar.c Auto-merging src/import/export-raw.h CONFLICT (add/add): Merge conflict in src/import/export-raw.h Auto-merging src/import/export-raw.c CONFLICT (add/add): Merge conflict in src/import/export-raw.c Auto-merging src/import/curl-util.h CONFLICT (add/add): Merge conflict in src/import/curl-util.h Auto-merging src/import/curl-util.c CONFLICT (add/add): Merge conflict in src/import/curl-util.c Auto-merging src/id128/id128.c CONFLICT (add/add): Merge conflict in src/id128/id128.c Auto-merging src/hwdb/hwdb.c CONFLICT (add/add): Merge conflict in src/hwdb/hwdb.c Auto-merging src/hostname/org.freedesktop.hostname1.service CONFLICT (add/add): Merge conflict in src/hostname/org.freedesktop.hostname1.service Auto-merging src/hostname/org.freedesktop.hostname1.policy CONFLICT (add/add): Merge conflict in src/hostname/org.freedesktop.hostname1.policy Auto-merging src/hostname/org.freedesktop.hostname1.conf CONFLICT (add/add): Merge conflict in src/hostname/org.freedesktop.hostname1.conf Auto-merging src/hostname/meson.build CONFLICT (add/add): Merge conflict in src/hostname/meson.build Auto-merging src/hostname/hostnamed.c CONFLICT (add/add): Merge conflict in src/hostname/hostnamed.c Auto-merging src/hostname/hostnamectl.c CONFLICT (add/add): Merge conflict in src/hostname/hostnamectl.c Auto-merging src/home/user-record-util.h CONFLICT (add/add): Merge conflict in src/home/user-record-util.h Auto-merging src/home/user-record-util.c CONFLICT (add/add): Merge conflict in src/home/user-record-util.c Auto-merging src/home/user-record-sign.h CONFLICT (add/add): Merge conflict in src/home/user-record-sign.h Auto-merging src/home/user-record-sign.c CONFLICT (add/add): Merge conflict in src/home/user-record-sign.c Auto-merging src/home/pam_systemd_home.sym CONFLICT (add/add): Merge conflict in src/home/pam_systemd_home.sym Auto-merging src/home/pam_systemd_home.c CONFLICT (add/add): Merge conflict in src/home/pam_systemd_home.c Auto-merging src/home/org.freedesktop.home1.service CONFLICT (add/add): Merge conflict in src/home/org.freedesktop.home1.service Auto-merging src/home/org.freedesktop.home1.policy CONFLICT (add/add): Merge conflict in src/home/org.freedesktop.home1.policy Auto-merging src/home/org.freedesktop.home1.conf CONFLICT (add/add): Merge conflict in src/home/org.freedesktop.home1.conf Auto-merging src/home/meson.build CONFLICT (add/add): Merge conflict in src/home/meson.build Auto-merging src/home/homework.h CONFLICT (add/add): Merge conflict in src/home/homework.h Auto-merging src/home/homework.c CONFLICT (add/add): Merge conflict in src/home/homework.c Auto-merging src/home/homework-quota.h CONFLICT (add/add): Merge conflict in src/home/homework-quota.h Auto-merging src/home/homework-quota.c CONFLICT (add/add): Merge conflict in src/home/homework-quota.c Auto-merging src/home/homework-pkcs11.h CONFLICT (add/add): Merge conflict in src/home/homework-pkcs11.h Auto-merging src/home/homework-pkcs11.c CONFLICT (add/add): Merge conflict in src/home/homework-pkcs11.c Auto-merging src/home/homework-mount.h CONFLICT (add/add): Merge conflict in src/home/homework-mount.h Auto-merging src/home/homework-mount.c CONFLICT (add/add): Merge conflict in src/home/homework-mount.c Auto-merging src/home/homework-luks.h CONFLICT (add/add): Merge conflict in src/home/homework-luks.h Auto-merging src/home/homework-luks.c CONFLICT (add/add): Merge conflict in src/home/homework-luks.c Auto-merging src/home/homework-fscrypt.h CONFLICT (add/add): Merge conflict in src/home/homework-fscrypt.h Auto-merging src/home/homework-fscrypt.c CONFLICT (add/add): Merge conflict in src/home/homework-fscrypt.c Auto-merging src/home/homework-directory.h CONFLICT (add/add): Merge conflict in src/home/homework-directory.h Auto-merging src/home/homework-directory.c CONFLICT (add/add): Merge conflict in src/home/homework-directory.c Auto-merging src/home/homework-cifs.h CONFLICT (add/add): Merge conflict in src/home/homework-cifs.h Auto-merging src/home/homework-cifs.c CONFLICT (add/add): Merge conflict in src/home/homework-cifs.c Auto-merging src/home/homed.conf CONFLICT (add/add): Merge conflict in src/home/homed.conf Auto-merging src/home/homed.c CONFLICT (add/add): Merge conflict in src/home/homed.c Auto-merging src/home/homed-varlink.h CONFLICT (add/add): Merge conflict in src/home/homed-varlink.h Auto-merging src/home/homed-varlink.c CONFLICT (add/add): Merge conflict in src/home/homed-varlink.c Auto-merging src/home/homed-operation.h CONFLICT (add/add): Merge conflict in src/home/homed-operation.h Auto-merging src/home/homed-operation.c CONFLICT (add/add): Merge conflict in src/home/homed-operation.c Auto-merging src/home/homed-manager.h CONFLICT (add/add): Merge conflict in src/home/homed-manager.h Auto-merging src/home/homed-manager.c CONFLICT (add/add): Merge conflict in src/home/homed-manager.c Auto-merging src/home/homed-manager-bus.h CONFLICT (add/add): Merge conflict in src/home/homed-manager-bus.h Auto-merging src/home/homed-manager-bus.c CONFLICT (add/add): Merge conflict in src/home/homed-manager-bus.c Auto-merging src/home/homed-home.h CONFLICT (add/add): Merge conflict in src/home/homed-home.h Auto-merging src/home/homed-home.c CONFLICT (add/add): Merge conflict in src/home/homed-home.c Auto-merging src/home/homed-home-bus.h CONFLICT (add/add): Merge conflict in src/home/homed-home-bus.h Auto-merging src/home/homed-home-bus.c CONFLICT (add/add): Merge conflict in src/home/homed-home-bus.c Auto-merging src/home/homed-conf.h CONFLICT (add/add): Merge conflict in src/home/homed-conf.h Auto-merging src/home/homed-conf.c CONFLICT (add/add): Merge conflict in src/home/homed-conf.c Auto-merging src/home/homed-bus.h CONFLICT (add/add): Merge conflict in src/home/homed-bus.h Auto-merging src/home/homed-bus.c CONFLICT (add/add): Merge conflict in src/home/homed-bus.c Auto-merging src/home/homectl.c CONFLICT (add/add): Merge conflict in src/home/homectl.c Auto-merging src/home/home-util.h CONFLICT (add/add): Merge conflict in src/home/home-util.h Auto-merging src/home/home-util.c CONFLICT (add/add): Merge conflict in src/home/home-util.c Auto-merging src/hibernate-resume/hibernate-resume.c CONFLICT (add/add): Merge conflict in src/hibernate-resume/hibernate-resume.c Auto-merging src/hibernate-resume/hibernate-resume-generator.c CONFLICT (add/add): Merge conflict in src/hibernate-resume/hibernate-resume-generator.c Auto-merging src/gpt-auto-generator/gpt-auto-generator.c CONFLICT (add/add): Merge conflict in src/gpt-auto-generator/gpt-auto-generator.c Auto-merging src/getty-generator/getty-generator.c CONFLICT (add/add): Merge conflict in src/getty-generator/getty-generator.c Auto-merging src/fuzz/meson.build CONFLICT (add/add): Merge conflict in src/fuzz/meson.build Auto-merging src/fuzz/fuzz.h CONFLICT (add/add): Merge conflict in src/fuzz/fuzz.h Auto-merging src/fuzz/fuzz-xdg-desktop.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-xdg-desktop.c Auto-merging src/fuzz/fuzz-varlink.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-varlink.c Auto-merging src/fuzz/fuzz-unit-file.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-unit-file.c Auto-merging src/fuzz/fuzz-udev-rules.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-udev-rules.c Auto-merging src/fuzz/fuzz-udev-database.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-udev-database.c Auto-merging src/fuzz/fuzz-time-util.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-time-util.c Auto-merging src/fuzz/fuzz-nspawn-settings.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-nspawn-settings.c Auto-merging src/fuzz/fuzz-nspawn-oci.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-nspawn-oci.c Auto-merging src/fuzz/fuzz-ndisc-rs.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-ndisc-rs.c Auto-merging src/fuzz/fuzz-main.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-main.c Auto-merging src/fuzz/fuzz-lldp.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-lldp.c Auto-merging src/fuzz/fuzz-json.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-json.c Auto-merging src/fuzz/fuzz-journald.h CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald.h Auto-merging src/fuzz/fuzz-journald.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald.c Auto-merging src/fuzz/fuzz-journald-syslog.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-syslog.c Auto-merging src/fuzz/fuzz-journald-stream.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-stream.c Auto-merging src/fuzz/fuzz-journald-native.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-native.c Auto-merging src/fuzz/fuzz-journald-native-fd.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-native-fd.c Auto-merging src/fuzz/fuzz-journald-kmsg.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-kmsg.c Auto-merging src/fuzz/fuzz-journald-audit.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-audit.c Auto-merging src/fuzz/fuzz-journal-remote.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journal-remote.c Auto-merging src/fuzz/fuzz-hostname-util.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-hostname-util.c Auto-merging src/fuzz/fuzz-env-file.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-env-file.c Auto-merging src/fuzz/fuzz-dns-packet.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-dns-packet.c Auto-merging src/fuzz/fuzz-dhcp6-client.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-dhcp6-client.c Auto-merging src/fuzz/fuzz-dhcp-server.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-dhcp-server.c Auto-merging src/fuzz/fuzz-compress.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-compress.c Auto-merging src/fuzz/fuzz-catalog.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-catalog.c Auto-merging src/fuzz/fuzz-calendarspec.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-calendarspec.c Auto-merging src/fuzz/fuzz-bus-message.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-bus-message.c Auto-merging src/fuzz/fuzz-bus-label.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-bus-label.c Auto-merging src/fstab-generator/fstab-generator.c CONFLICT (add/add): Merge conflict in src/fstab-generator/fstab-generator.c Auto-merging src/fsck/fsck.c CONFLICT (add/add): Merge conflict in src/fsck/fsck.c Auto-merging src/firstboot/firstboot.c CONFLICT (add/add): Merge conflict in src/firstboot/firstboot.c Auto-merging src/escape/escape.c CONFLICT (add/add): Merge conflict in src/escape/escape.c Auto-merging src/environment-d-generator/environment-d-generator.c CONFLICT (add/add): Merge conflict in src/environment-d-generator/environment-d-generator.c Auto-merging src/dissect/dissect.c CONFLICT (add/add): Merge conflict in src/dissect/dissect.c Auto-merging src/detect-virt/detect-virt.c CONFLICT (add/add): Merge conflict in src/detect-virt/detect-virt.c Auto-merging src/delta/delta.c CONFLICT (add/add): Merge conflict in src/delta/delta.c Auto-merging src/debug-generator/debug-generator.c CONFLICT (add/add): Merge conflict in src/debug-generator/debug-generator.c Auto-merging src/cryptsetup/cryptsetup.c CONFLICT (add/add): Merge conflict in src/cryptsetup/cryptsetup.c Auto-merging src/cryptsetup/cryptsetup-pkcs11.h CONFLICT (add/add): Merge conflict in src/cryptsetup/cryptsetup-pkcs11.h Auto-merging src/cryptsetup/cryptsetup-pkcs11.c CONFLICT (add/add): Merge conflict in src/cryptsetup/cryptsetup-pkcs11.c Auto-merging src/cryptsetup/cryptsetup-generator.c CONFLICT (add/add): Merge conflict in src/cryptsetup/cryptsetup-generator.c Auto-merging src/coredump/test-coredump-vacuum.c CONFLICT (add/add): Merge conflict in src/coredump/test-coredump-vacuum.c Auto-merging src/coredump/stacktrace.h CONFLICT (add/add): Merge conflict in src/coredump/stacktrace.h Auto-merging src/coredump/stacktrace.c CONFLICT (add/add): Merge conflict in src/coredump/stacktrace.c Auto-merging src/coredump/meson.build CONFLICT (add/add): Merge conflict in src/coredump/meson.build Auto-merging src/coredump/coredumpctl.c CONFLICT (add/add): Merge conflict in src/coredump/coredumpctl.c Auto-merging src/coredump/coredump.c CONFLICT (add/add): Merge conflict in src/coredump/coredump.c Auto-merging src/coredump/coredump-vacuum.h CONFLICT (add/add): Merge conflict in src/coredump/coredump-vacuum.h Auto-merging src/coredump/coredump-vacuum.c CONFLICT (add/add): Merge conflict in src/coredump/coredump-vacuum.c Auto-merging src/core/unit.h CONFLICT (add/add): Merge conflict in src/core/unit.h Auto-merging src/core/unit.c CONFLICT (add/add): Merge conflict in src/core/unit.c Auto-merging src/core/unit-printf.h CONFLICT (add/add): Merge conflict in src/core/unit-printf.h Auto-merging src/core/unit-printf.c CONFLICT (add/add): Merge conflict in src/core/unit-printf.c Auto-merging src/core/triggers.systemd.in CONFLICT (add/add): Merge conflict in src/core/triggers.systemd.in Auto-merging src/core/transaction.h CONFLICT (add/add): Merge conflict in src/core/transaction.h Auto-merging src/core/transaction.c CONFLICT (add/add): Merge conflict in src/core/transaction.c Auto-merging src/core/timer.h CONFLICT (add/add): Merge conflict in src/core/timer.h Auto-merging src/core/timer.c CONFLICT (add/add): Merge conflict in src/core/timer.c Auto-merging src/core/target.h CONFLICT (add/add): Merge conflict in src/core/target.h Auto-merging src/core/target.c CONFLICT (add/add): Merge conflict in src/core/target.c Auto-merging src/core/systemd.pc.in CONFLICT (add/add): Merge conflict in src/core/systemd.pc.in Auto-merging src/core/swap.h CONFLICT (add/add): Merge conflict in src/core/swap.h Auto-merging src/core/swap.c CONFLICT (add/add): Merge conflict in src/core/swap.c Auto-merging src/core/socket.h CONFLICT (add/add): Merge conflict in src/core/socket.h Auto-merging src/core/socket.c CONFLICT (add/add): Merge conflict in src/core/socket.c Auto-merging src/core/smack-setup.h CONFLICT (add/add): Merge conflict in src/core/smack-setup.h Auto-merging src/core/smack-setup.c CONFLICT (add/add): Merge conflict in src/core/smack-setup.c Auto-merging src/core/slice.h CONFLICT (add/add): Merge conflict in src/core/slice.h Auto-merging src/core/slice.c CONFLICT (add/add): Merge conflict in src/core/slice.c Auto-merging src/core/show-status.h CONFLICT (add/add): Merge conflict in src/core/show-status.h Auto-merging src/core/show-status.c CONFLICT (add/add): Merge conflict in src/core/show-status.c Auto-merging src/core/service.h CONFLICT (add/add): Merge conflict in src/core/service.h Auto-merging src/core/service.c CONFLICT (add/add): Merge conflict in src/core/service.c Auto-merging src/core/selinux-setup.h CONFLICT (add/add): Merge conflict in src/core/selinux-setup.h Auto-merging src/core/selinux-setup.c CONFLICT (add/add): Merge conflict in src/core/selinux-setup.c Auto-merging src/core/selinux-access.h CONFLICT (add/add): Merge conflict in src/core/selinux-access.h Auto-merging src/core/selinux-access.c CONFLICT (add/add): Merge conflict in src/core/selinux-access.c Auto-merging src/core/scope.h CONFLICT (add/add): Merge conflict in src/core/scope.h Auto-merging src/core/scope.c CONFLICT (add/add): Merge conflict in src/core/scope.c Auto-merging src/core/path.h CONFLICT (add/add): Merge conflict in src/core/path.h Auto-merging src/core/path.c CONFLICT (add/add): Merge conflict in src/core/path.c Auto-merging src/core/org.freedesktop.systemd1.service CONFLICT (add/add): Merge conflict in src/core/org.freedesktop.systemd1.service Auto-merging src/core/org.freedesktop.systemd1.policy.in CONFLICT (add/add): Merge conflict in src/core/org.freedesktop.systemd1.policy.in Auto-merging src/core/org.freedesktop.systemd1.conf CONFLICT (add/add): Merge conflict in src/core/org.freedesktop.systemd1.conf Auto-merging src/core/namespace.h CONFLICT (add/add): Merge conflict in src/core/namespace.h Auto-merging src/core/namespace.c CONFLICT (add/add): Merge conflict in src/core/namespace.c Auto-merging src/core/mount.h CONFLICT (add/add): Merge conflict in src/core/mount.h Auto-merging src/core/mount.c CONFLICT (add/add): Merge conflict in src/core/mount.c Auto-merging src/core/mount-setup.h CONFLICT (add/add): Merge conflict in src/core/mount-setup.h Auto-merging src/core/mount-setup.c CONFLICT (add/add): Merge conflict in src/core/mount-setup.c Auto-merging src/core/meson.build CONFLICT (add/add): Merge conflict in src/core/meson.build Auto-merging src/core/manager.h CONFLICT (add/add): Merge conflict in src/core/manager.h Auto-merging src/core/manager.c CONFLICT (add/add): Merge conflict in src/core/manager.c Auto-merging src/core/main.c CONFLICT (add/add): Merge conflict in src/core/main.c Auto-merging src/core/macros.systemd.in CONFLICT (add/add): Merge conflict in src/core/macros.systemd.in Auto-merging src/core/machine-id-setup.h CONFLICT (add/add): Merge conflict in src/core/machine-id-setup.h Auto-merging src/core/machine-id-setup.c CONFLICT (add/add): Merge conflict in src/core/machine-id-setup.c Auto-merging src/core/loopback-setup.h CONFLICT (add/add): Merge conflict in src/core/loopback-setup.h Auto-merging src/core/loopback-setup.c CONFLICT (add/add): Merge conflict in src/core/loopback-setup.c Auto-merging src/core/locale-setup.h CONFLICT (add/add): Merge conflict in src/core/locale-setup.h Auto-merging src/core/locale-setup.c CONFLICT (add/add): Merge conflict in src/core/locale-setup.c Auto-merging src/core/load-fragment.h CONFLICT (add/add): Merge conflict in src/core/load-fragment.h Auto-merging src/core/load-fragment.c CONFLICT (add/add): Merge conflict in src/core/load-fragment.c Auto-merging src/core/load-fragment-gperf.gperf.m4 CONFLICT (add/add): Merge conflict in src/core/load-fragment-gperf.gperf.m4 Auto-merging src/core/load-dropin.h CONFLICT (add/add): Merge conflict in src/core/load-dropin.h Auto-merging src/core/load-dropin.c CONFLICT (add/add): Merge conflict in src/core/load-dropin.c Auto-merging src/core/kmod-setup.h CONFLICT (add/add): Merge conflict in src/core/kmod-setup.h Auto-merging src/core/kmod-setup.c CONFLICT (add/add): Merge conflict in src/core/kmod-setup.c Auto-merging src/core/killall.h CONFLICT (add/add): Merge conflict in src/core/killall.h Auto-merging src/core/killall.c CONFLICT (add/add): Merge conflict in src/core/killall.c Auto-merging src/core/kill.h CONFLICT (add/add): Merge conflict in src/core/kill.h Auto-merging src/core/kill.c CONFLICT (add/add): Merge conflict in src/core/kill.c Auto-merging src/core/job.h CONFLICT (add/add): Merge conflict in src/core/job.h Auto-merging src/core/job.c CONFLICT (add/add): Merge conflict in src/core/job.c Auto-merging src/core/ip-address-access.h CONFLICT (add/add): Merge conflict in src/core/ip-address-access.h Auto-merging src/core/ip-address-access.c CONFLICT (add/add): Merge conflict in src/core/ip-address-access.c Auto-merging src/core/ima-setup.h CONFLICT (add/add): Merge conflict in src/core/ima-setup.h Auto-merging src/core/ima-setup.c CONFLICT (add/add): Merge conflict in src/core/ima-setup.c Auto-merging src/core/hostname-setup.h CONFLICT (add/add): Merge conflict in src/core/hostname-setup.h Auto-merging src/core/hostname-setup.c CONFLICT (add/add): Merge conflict in src/core/hostname-setup.c Auto-merging src/core/generator-setup.h CONFLICT (add/add): Merge conflict in src/core/generator-setup.h Auto-merging src/core/generator-setup.c CONFLICT (add/add): Merge conflict in src/core/generator-setup.c Auto-merging src/core/execute.h CONFLICT (add/add): Merge conflict in src/core/execute.h Auto-merging src/core/execute.c CONFLICT (add/add): Merge conflict in src/core/execute.c Auto-merging src/core/emergency-action.h CONFLICT (add/add): Merge conflict in src/core/emergency-action.h Auto-merging src/core/emergency-action.c CONFLICT (add/add): Merge conflict in src/core/emergency-action.c Auto-merging src/core/efi-random.h CONFLICT (add/add): Merge conflict in src/core/efi-random.h Auto-merging src/core/efi-random.c CONFLICT (add/add): Merge conflict in src/core/efi-random.c Auto-merging src/core/dynamic-user.h CONFLICT (add/add): Merge conflict in src/core/dynamic-user.h Auto-merging src/core/dynamic-user.c CONFLICT (add/add): Merge conflict in src/core/dynamic-user.c Auto-merging src/core/device.h CONFLICT (add/add): Merge conflict in src/core/device.h Auto-merging src/core/device.c CONFLICT (add/add): Merge conflict in src/core/device.c Auto-merging src/core/dbus.h CONFLICT (add/add): Merge conflict in src/core/dbus.h Auto-merging src/core/dbus.c CONFLICT (add/add): Merge conflict in src/core/dbus.c Auto-merging src/core/dbus-util.h CONFLICT (add/add): Merge conflict in src/core/dbus-util.h Auto-merging src/core/dbus-util.c CONFLICT (add/add): Merge conflict in src/core/dbus-util.c Auto-merging src/core/dbus-unit.h CONFLICT (add/add): Merge conflict in src/core/dbus-unit.h Auto-merging src/core/dbus-unit.c CONFLICT (add/add): Merge conflict in src/core/dbus-unit.c Auto-merging src/core/dbus-timer.h CONFLICT (add/add): Merge conflict in src/core/dbus-timer.h Auto-merging src/core/dbus-timer.c CONFLICT (add/add): Merge conflict in src/core/dbus-timer.c Auto-merging src/core/dbus-target.h CONFLICT (add/add): Merge conflict in src/core/dbus-target.h Auto-merging src/core/dbus-target.c CONFLICT (add/add): Merge conflict in src/core/dbus-target.c Auto-merging src/core/dbus-swap.h CONFLICT (add/add): Merge conflict in src/core/dbus-swap.h Auto-merging src/core/dbus-swap.c CONFLICT (add/add): Merge conflict in src/core/dbus-swap.c Auto-merging src/core/dbus-socket.h CONFLICT (add/add): Merge conflict in src/core/dbus-socket.h Auto-merging src/core/dbus-socket.c CONFLICT (add/add): Merge conflict in src/core/dbus-socket.c Auto-merging src/core/dbus-slice.h CONFLICT (add/add): Merge conflict in src/core/dbus-slice.h Auto-merging src/core/dbus-slice.c CONFLICT (add/add): Merge conflict in src/core/dbus-slice.c Auto-merging src/core/dbus-service.h CONFLICT (add/add): Merge conflict in src/core/dbus-service.h Auto-merging src/core/dbus-service.c CONFLICT (add/add): Merge conflict in src/core/dbus-service.c Auto-merging src/core/dbus-scope.h CONFLICT (add/add): Merge conflict in src/core/dbus-scope.h Auto-merging src/core/dbus-scope.c CONFLICT (add/add): Merge conflict in src/core/dbus-scope.c Auto-merging src/core/dbus-path.h CONFLICT (add/add): Merge conflict in src/core/dbus-path.h Auto-merging src/core/dbus-path.c CONFLICT (add/add): Merge conflict in src/core/dbus-path.c Auto-merging src/core/dbus-mount.h CONFLICT (add/add): Merge conflict in src/core/dbus-mount.h Auto-merging src/core/dbus-mount.c CONFLICT (add/add): Merge conflict in src/core/dbus-mount.c Auto-merging src/core/dbus-manager.h CONFLICT (add/add): Merge conflict in src/core/dbus-manager.h Auto-merging src/core/dbus-manager.c CONFLICT (add/add): Merge conflict in src/core/dbus-manager.c Auto-merging src/core/dbus-kill.h CONFLICT (add/add): Merge conflict in src/core/dbus-kill.h Auto-merging src/core/dbus-kill.c CONFLICT (add/add): Merge conflict in src/core/dbus-kill.c Auto-merging src/core/dbus-job.h CONFLICT (add/add): Merge conflict in src/core/dbus-job.h Auto-merging src/core/dbus-job.c CONFLICT (add/add): Merge conflict in src/core/dbus-job.c Auto-merging src/core/dbus-execute.h CONFLICT (add/add): Merge conflict in src/core/dbus-execute.h Auto-merging src/core/dbus-execute.c CONFLICT (add/add): Merge conflict in src/core/dbus-execute.c Auto-merging src/core/dbus-device.h CONFLICT (add/add): Merge conflict in src/core/dbus-device.h Auto-merging src/core/dbus-device.c CONFLICT (add/add): Merge conflict in src/core/dbus-device.c Auto-merging src/core/dbus-cgroup.h CONFLICT (add/add): Merge conflict in src/core/dbus-cgroup.h Auto-merging src/core/dbus-cgroup.c CONFLICT (add/add): Merge conflict in src/core/dbus-cgroup.c Auto-merging src/core/dbus-automount.h CONFLICT (add/add): Merge conflict in src/core/dbus-automount.h Auto-merging src/core/dbus-automount.c CONFLICT (add/add): Merge conflict in src/core/dbus-automount.c Auto-merging src/core/core-varlink.h CONFLICT (add/add): Merge conflict in src/core/core-varlink.h Auto-merging src/core/core-varlink.c CONFLICT (add/add): Merge conflict in src/core/core-varlink.c Auto-merging src/core/cgroup.h CONFLICT (add/add): Merge conflict in src/core/cgroup.h Auto-merging src/core/cgroup.c CONFLICT (add/add): Merge conflict in src/core/cgroup.c Auto-merging src/core/bpf-firewall.h CONFLICT (add/add): Merge conflict in src/core/bpf-firewall.h Auto-merging src/core/bpf-firewall.c CONFLICT (add/add): Merge conflict in src/core/bpf-firewall.c Auto-merging src/core/bpf-devices.h CONFLICT (add/add): Merge conflict in src/core/bpf-devices.h Auto-merging src/core/bpf-devices.c CONFLICT (add/add): Merge conflict in src/core/bpf-devices.c Auto-merging src/core/automount.h CONFLICT (add/add): Merge conflict in src/core/automount.h Auto-merging src/core/automount.c CONFLICT (add/add): Merge conflict in src/core/automount.c Auto-merging src/core/audit-fd.h CONFLICT (add/add): Merge conflict in src/core/audit-fd.h Auto-merging src/core/audit-fd.c CONFLICT (add/add): Merge conflict in src/core/audit-fd.c Auto-merging src/core/all-units.h CONFLICT (add/add): Merge conflict in src/core/all-units.h Auto-merging src/cgtop/cgtop.c CONFLICT (add/add): Merge conflict in src/cgtop/cgtop.c Auto-merging src/cgroups-agent/cgroups-agent.c CONFLICT (add/add): Merge conflict in src/cgroups-agent/cgroups-agent.c Auto-merging src/cgls/cgls.c CONFLICT (add/add): Merge conflict in src/cgls/cgls.c Auto-merging src/busctl/busctl.c CONFLICT (add/add): Merge conflict in src/busctl/busctl.c Auto-merging src/busctl/busctl-introspect.h CONFLICT (add/add): Merge conflict in src/busctl/busctl-introspect.h Auto-merging src/busctl/busctl-introspect.c CONFLICT (add/add): Merge conflict in src/busctl/busctl-introspect.c Auto-merging src/boot/efi/util.h CONFLICT (add/add): Merge conflict in src/boot/efi/util.h Auto-merging src/boot/efi/util.c CONFLICT (add/add): Merge conflict in src/boot/efi/util.c Auto-merging src/boot/efi/stub.c CONFLICT (add/add): Merge conflict in src/boot/efi/stub.c Auto-merging src/boot/efi/splash.h CONFLICT (add/add): Merge conflict in src/boot/efi/splash.h Auto-merging src/boot/efi/splash.c CONFLICT (add/add): Merge conflict in src/boot/efi/splash.c Auto-merging src/boot/efi/shim.h CONFLICT (add/add): Merge conflict in src/boot/efi/shim.h Auto-merging src/boot/efi/shim.c CONFLICT (add/add): Merge conflict in src/boot/efi/shim.c Auto-merging src/boot/efi/sha256.h CONFLICT (add/add): Merge conflict in src/boot/efi/sha256.h Auto-merging src/boot/efi/sha256.c CONFLICT (add/add): Merge conflict in src/boot/efi/sha256.c Auto-merging src/boot/efi/random-seed.h CONFLICT (add/add): Merge conflict in src/boot/efi/random-seed.h Auto-merging src/boot/efi/random-seed.c CONFLICT (add/add): Merge conflict in src/boot/efi/random-seed.c Auto-merging src/boot/efi/pe.h CONFLICT (add/add): Merge conflict in src/boot/efi/pe.h Auto-merging src/boot/efi/pe.c CONFLICT (add/add): Merge conflict in src/boot/efi/pe.c Auto-merging src/boot/efi/missing_efi.h CONFLICT (add/add): Merge conflict in src/boot/efi/missing_efi.h Auto-merging src/boot/efi/meson.build CONFLICT (add/add): Merge conflict in src/boot/efi/meson.build Auto-merging src/boot/efi/measure.h CONFLICT (add/add): Merge conflict in src/boot/efi/measure.h Auto-merging src/boot/efi/measure.c CONFLICT (add/add): Merge conflict in src/boot/efi/measure.c Auto-merging src/boot/efi/loader-features.h CONFLICT (add/add): Merge conflict in src/boot/efi/loader-features.h Auto-merging src/boot/efi/linux.h CONFLICT (add/add): Merge conflict in src/boot/efi/linux.h Auto-merging src/boot/efi/linux.c CONFLICT (add/add): Merge conflict in src/boot/efi/linux.c Auto-merging src/boot/efi/graphics.h CONFLICT (add/add): Merge conflict in src/boot/efi/graphics.h Auto-merging src/boot/efi/graphics.c CONFLICT (add/add): Merge conflict in src/boot/efi/graphics.c Auto-merging src/boot/efi/disk.h CONFLICT (add/add): Merge conflict in src/boot/efi/disk.h Auto-merging src/boot/efi/disk.c CONFLICT (add/add): Merge conflict in src/boot/efi/disk.c Auto-merging src/boot/efi/crc32.h CONFLICT (add/add): Merge conflict in src/boot/efi/crc32.h Auto-merging src/boot/efi/crc32.c CONFLICT (add/add): Merge conflict in src/boot/efi/crc32.c Auto-merging src/boot/efi/console.h CONFLICT (add/add): Merge conflict in src/boot/efi/console.h Auto-merging src/boot/efi/console.c CONFLICT (add/add): Merge conflict in src/boot/efi/console.c Auto-merging src/boot/efi/boot.c CONFLICT (add/add): Merge conflict in src/boot/efi/boot.c Auto-merging src/boot/bootctl.c CONFLICT (add/add): Merge conflict in src/boot/bootctl.c Auto-merging src/boot/boot-check-no-failures.c CONFLICT (add/add): Merge conflict in src/boot/boot-check-no-failures.c Auto-merging src/boot/bless-boot.c CONFLICT (add/add): Merge conflict in src/boot/bless-boot.c Auto-merging src/boot/bless-boot-generator.c CONFLICT (add/add): Merge conflict in src/boot/bless-boot-generator.c Auto-merging src/binfmt/binfmt.c CONFLICT (add/add): Merge conflict in src/binfmt/binfmt.c Auto-merging src/basic/xattr-util.h CONFLICT (add/add): Merge conflict in src/basic/xattr-util.h Auto-merging src/basic/xattr-util.c CONFLICT (add/add): Merge conflict in src/basic/xattr-util.c Auto-merging src/basic/virt.h CONFLICT (add/add): Merge conflict in src/basic/virt.h Auto-merging src/basic/virt.c CONFLICT (add/add): Merge conflict in src/basic/virt.c Auto-merging src/basic/util.h CONFLICT (add/add): Merge conflict in src/basic/util.h Auto-merging src/basic/util.c CONFLICT (add/add): Merge conflict in src/basic/util.c Auto-merging src/basic/utf8.h CONFLICT (add/add): Merge conflict in src/basic/utf8.h Auto-merging src/basic/utf8.c CONFLICT (add/add): Merge conflict in src/basic/utf8.c Auto-merging src/basic/user-util.h CONFLICT (add/add): Merge conflict in src/basic/user-util.h Auto-merging src/basic/user-util.c CONFLICT (add/add): Merge conflict in src/basic/user-util.c Auto-merging src/basic/unit-name.h CONFLICT (add/add): Merge conflict in src/basic/unit-name.h Auto-merging src/basic/unit-name.c CONFLICT (add/add): Merge conflict in src/basic/unit-name.c Auto-merging src/basic/unit-def.h CONFLICT (add/add): Merge conflict in src/basic/unit-def.h Auto-merging src/basic/unit-def.c CONFLICT (add/add): Merge conflict in src/basic/unit-def.c Auto-merging src/basic/unaligned.h CONFLICT (add/add): Merge conflict in src/basic/unaligned.h Auto-merging src/basic/umask-util.h CONFLICT (add/add): Merge conflict in src/basic/umask-util.h Auto-merging src/basic/tmpfile-util.h CONFLICT (add/add): Merge conflict in src/basic/tmpfile-util.h Auto-merging src/basic/tmpfile-util.c CONFLICT (add/add): Merge conflict in src/basic/tmpfile-util.c Auto-merging src/basic/time-util.h CONFLICT (add/add): Merge conflict in src/basic/time-util.h Auto-merging src/basic/time-util.c CONFLICT (add/add): Merge conflict in src/basic/time-util.c Auto-merging src/basic/terminal-util.h CONFLICT (add/add): Merge conflict in src/basic/terminal-util.h Auto-merging src/basic/terminal-util.c CONFLICT (add/add): Merge conflict in src/basic/terminal-util.c Auto-merging src/basic/syslog-util.h CONFLICT (add/add): Merge conflict in src/basic/syslog-util.h Auto-merging src/basic/syslog-util.c CONFLICT (add/add): Merge conflict in src/basic/syslog-util.c Auto-merging src/basic/strxcpyx.h CONFLICT (add/add): Merge conflict in src/basic/strxcpyx.h Auto-merging src/basic/strxcpyx.c CONFLICT (add/add): Merge conflict in src/basic/strxcpyx.c Auto-merging src/basic/strv.h CONFLICT (add/add): Merge conflict in src/basic/strv.h Auto-merging src/basic/strv.c CONFLICT (add/add): Merge conflict in src/basic/strv.c Auto-merging src/basic/string-util.h CONFLICT (add/add): Merge conflict in src/basic/string-util.h Auto-merging src/basic/string-util.c CONFLICT (add/add): Merge conflict in src/basic/string-util.c Auto-merging src/basic/string-table.h CONFLICT (add/add): Merge conflict in src/basic/string-table.h Auto-merging src/basic/string-table.c CONFLICT (add/add): Merge conflict in src/basic/string-table.c Auto-merging src/basic/strbuf.h CONFLICT (add/add): Merge conflict in src/basic/strbuf.h Auto-merging src/basic/strbuf.c CONFLICT (add/add): Merge conflict in src/basic/strbuf.c Auto-merging src/basic/stdio-util.h CONFLICT (add/add): Merge conflict in src/basic/stdio-util.h Auto-merging src/basic/static-destruct.h CONFLICT (add/add): Merge conflict in src/basic/static-destruct.h Auto-merging src/basic/stat-util.h CONFLICT (add/add): Merge conflict in src/basic/stat-util.h Auto-merging src/basic/stat-util.c CONFLICT (add/add): Merge conflict in src/basic/stat-util.c Auto-merging src/basic/special.h CONFLICT (add/add): Merge conflict in src/basic/special.h Auto-merging src/basic/sort-util.h CONFLICT (add/add): Merge conflict in src/basic/sort-util.h Auto-merging src/basic/sort-util.c CONFLICT (add/add): Merge conflict in src/basic/sort-util.c Auto-merging src/basic/socket-util.h CONFLICT (add/add): Merge conflict in src/basic/socket-util.h Auto-merging src/basic/socket-util.c CONFLICT (add/add): Merge conflict in src/basic/socket-util.c Auto-merging src/basic/socket-label.c CONFLICT (add/add): Merge conflict in src/basic/socket-label.c Auto-merging src/basic/smack-util.h CONFLICT (add/add): Merge conflict in src/basic/smack-util.h Auto-merging src/basic/smack-util.c CONFLICT (add/add): Merge conflict in src/basic/smack-util.c Auto-merging src/basic/siphash24.h CONFLICT (add/add): Merge conflict in src/basic/siphash24.h Auto-merging src/basic/siphash24.c CONFLICT (add/add): Merge conflict in src/basic/siphash24.c Auto-merging src/basic/signal-util.h CONFLICT (add/add): Merge conflict in src/basic/signal-util.h Auto-merging src/basic/signal-util.c CONFLICT (add/add): Merge conflict in src/basic/signal-util.c Auto-merging src/basic/sigbus.h CONFLICT (add/add): Merge conflict in src/basic/sigbus.h Auto-merging src/basic/sigbus.c CONFLICT (add/add): Merge conflict in src/basic/sigbus.c Auto-merging src/basic/set.h CONFLICT (add/add): Merge conflict in src/basic/set.h Auto-merging src/basic/selinux-util.h CONFLICT (add/add): Merge conflict in src/basic/selinux-util.h Auto-merging src/basic/selinux-util.c CONFLICT (add/add): Merge conflict in src/basic/selinux-util.c Auto-merging src/basic/rm-rf.h CONFLICT (add/add): Merge conflict in src/basic/rm-rf.h Auto-merging src/basic/rm-rf.c CONFLICT (add/add): Merge conflict in src/basic/rm-rf.c Auto-merging src/basic/rlimit-util.h CONFLICT (add/add): Merge conflict in src/basic/rlimit-util.h Auto-merging src/basic/rlimit-util.c CONFLICT (add/add): Merge conflict in src/basic/rlimit-util.c Auto-merging src/basic/replace-var.h CONFLICT (add/add): Merge conflict in src/basic/replace-var.h Auto-merging src/basic/replace-var.c CONFLICT (add/add): Merge conflict in src/basic/replace-var.c Auto-merging src/basic/raw-reboot.h CONFLICT (add/add): Merge conflict in src/basic/raw-reboot.h Auto-merging src/basic/raw-clone.h CONFLICT (add/add): Merge conflict in src/basic/raw-clone.h Auto-merging src/basic/ratelimit.h CONFLICT (add/add): Merge conflict in src/basic/ratelimit.h Auto-merging src/basic/ratelimit.c CONFLICT (add/add): Merge conflict in src/basic/ratelimit.c Auto-merging src/basic/random-util.h CONFLICT (add/add): Merge conflict in src/basic/random-util.h Auto-merging src/basic/random-util.c CONFLICT (add/add): Merge conflict in src/basic/random-util.c Auto-merging src/basic/quota-util.h CONFLICT (add/add): Merge conflict in src/basic/quota-util.h Auto-merging src/basic/quota-util.c CONFLICT (add/add): Merge conflict in src/basic/quota-util.c Auto-merging src/basic/pthread-util.h CONFLICT (add/add): Merge conflict in src/basic/pthread-util.h Auto-merging src/basic/procfs-util.h CONFLICT (add/add): Merge conflict in src/basic/procfs-util.h Auto-merging src/basic/procfs-util.c CONFLICT (add/add): Merge conflict in src/basic/procfs-util.c Auto-merging src/basic/process-util.h CONFLICT (add/add): Merge conflict in src/basic/process-util.h Auto-merging src/basic/process-util.c CONFLICT (add/add): Merge conflict in src/basic/process-util.c Auto-merging src/basic/proc-cmdline.h CONFLICT (add/add): Merge conflict in src/basic/proc-cmdline.h Auto-merging src/basic/proc-cmdline.c CONFLICT (add/add): Merge conflict in src/basic/proc-cmdline.c Auto-merging src/basic/prioq.h CONFLICT (add/add): Merge conflict in src/basic/prioq.h Auto-merging src/basic/prioq.c CONFLICT (add/add): Merge conflict in src/basic/prioq.c Auto-merging src/basic/path-util.h CONFLICT (add/add): Merge conflict in src/basic/path-util.h Auto-merging src/basic/path-util.c CONFLICT (add/add): Merge conflict in src/basic/path-util.c Auto-merging src/basic/path-lookup.h CONFLICT (add/add): Merge conflict in src/basic/path-lookup.h Auto-merging src/basic/path-lookup.c CONFLICT (add/add): Merge conflict in src/basic/path-lookup.c Auto-merging src/basic/parse-util.h CONFLICT (add/add): Merge conflict in src/basic/parse-util.h Auto-merging src/basic/parse-util.c CONFLICT (add/add): Merge conflict in src/basic/parse-util.c Auto-merging src/basic/ordered-set.h CONFLICT (add/add): Merge conflict in src/basic/ordered-set.h Auto-merging src/basic/ordered-set.c CONFLICT (add/add): Merge conflict in src/basic/ordered-set.c Auto-merging src/basic/nulstr-util.h CONFLICT (add/add): Merge conflict in src/basic/nulstr-util.h Auto-merging src/basic/nulstr-util.c CONFLICT (add/add): Merge conflict in src/basic/nulstr-util.c Auto-merging src/basic/nss-util.h CONFLICT (add/add): Merge conflict in src/basic/nss-util.h Auto-merging src/basic/namespace-util.h CONFLICT (add/add): Merge conflict in src/basic/namespace-util.h Auto-merging src/basic/namespace-util.c CONFLICT (add/add): Merge conflict in src/basic/namespace-util.c Auto-merging src/basic/mountpoint-util.h CONFLICT (add/add): Merge conflict in src/basic/mountpoint-util.h Auto-merging src/basic/mountpoint-util.c CONFLICT (add/add): Merge conflict in src/basic/mountpoint-util.c Auto-merging src/basic/mkdir.h CONFLICT (add/add): Merge conflict in src/basic/mkdir.h Auto-merging src/basic/mkdir.c CONFLICT (add/add): Merge conflict in src/basic/mkdir.c Auto-merging src/basic/mkdir-label.c CONFLICT (add/add): Merge conflict in src/basic/mkdir-label.c Auto-merging src/basic/missing_xfs.h CONFLICT (add/add): Merge conflict in src/basic/missing_xfs.h Auto-merging src/basic/missing_type.h CONFLICT (add/add): Merge conflict in src/basic/missing_type.h Auto-merging src/basic/missing_timerfd.h CONFLICT (add/add): Merge conflict in src/basic/missing_timerfd.h Auto-merging src/basic/missing_syscall.h CONFLICT (add/add): Merge conflict in src/basic/missing_syscall.h Auto-merging src/basic/missing_stdlib.h CONFLICT (add/add): Merge conflict in src/basic/missing_stdlib.h Auto-merging src/basic/missing_stat.h CONFLICT (add/add): Merge conflict in src/basic/missing_stat.h Auto-merging src/basic/missing_socket.h CONFLICT (add/add): Merge conflict in src/basic/missing_socket.h Auto-merging src/basic/missing_sched.h CONFLICT (add/add): Merge conflict in src/basic/missing_sched.h Auto-merging src/basic/missing_resource.h CONFLICT (add/add): Merge conflict in src/basic/missing_resource.h Auto-merging src/basic/missing_random.h CONFLICT (add/add): Merge conflict in src/basic/missing_random.h Auto-merging src/basic/missing_prctl.h CONFLICT (add/add): Merge conflict in src/basic/missing_prctl.h Auto-merging src/basic/missing_network.h CONFLICT (add/add): Merge conflict in src/basic/missing_network.h Auto-merging src/basic/missing_mman.h CONFLICT (add/add): Merge conflict in src/basic/missing_mman.h Auto-merging src/basic/missing_magic.h CONFLICT (add/add): Merge conflict in src/basic/missing_magic.h Auto-merging src/basic/missing_keyctl.h CONFLICT (add/add): Merge conflict in src/basic/missing_keyctl.h Auto-merging src/basic/missing_input.h CONFLICT (add/add): Merge conflict in src/basic/missing_input.h Auto-merging src/basic/missing_fs.h CONFLICT (add/add): Merge conflict in src/basic/missing_fs.h Auto-merging src/basic/missing_fcntl.h CONFLICT (add/add): Merge conflict in src/basic/missing_fcntl.h Auto-merging src/basic/missing_drm.h CONFLICT (add/add): Merge conflict in src/basic/missing_drm.h Auto-merging src/basic/missing_capability.h CONFLICT (add/add): Merge conflict in src/basic/missing_capability.h Auto-merging src/basic/missing_audit.h CONFLICT (add/add): Merge conflict in src/basic/missing_audit.h Auto-merging src/basic/meson.build CONFLICT (add/add): Merge conflict in src/basic/meson.build Auto-merging src/basic/mempool.h CONFLICT (add/add): Merge conflict in src/basic/mempool.h Auto-merging src/basic/mempool.c CONFLICT (add/add): Merge conflict in src/basic/mempool.c Auto-merging src/basic/memory-util.h CONFLICT (add/add): Merge conflict in src/basic/memory-util.h Auto-merging src/basic/memory-util.c CONFLICT (add/add): Merge conflict in src/basic/memory-util.c Auto-merging src/basic/memfd-util.h CONFLICT (add/add): Merge conflict in src/basic/memfd-util.h Auto-merging src/basic/memfd-util.c CONFLICT (add/add): Merge conflict in src/basic/memfd-util.c Auto-merging src/basic/macro.h CONFLICT (add/add): Merge conflict in src/basic/macro.h Auto-merging src/basic/login-util.h CONFLICT (add/add): Merge conflict in src/basic/login-util.h Auto-merging src/basic/login-util.c CONFLICT (add/add): Merge conflict in src/basic/login-util.c Auto-merging src/basic/log.h CONFLICT (add/add): Merge conflict in src/basic/log.h Auto-merging src/basic/log.c CONFLICT (add/add): Merge conflict in src/basic/log.c Auto-merging src/basic/locale-util.h CONFLICT (add/add): Merge conflict in src/basic/locale-util.h Auto-merging src/basic/locale-util.c CONFLICT (add/add): Merge conflict in src/basic/locale-util.c Auto-merging src/basic/list.h CONFLICT (add/add): Merge conflict in src/basic/list.h Auto-merging src/basic/linux/update.sh CONFLICT (add/add): Merge conflict in src/basic/linux/update.sh Auto-merging src/basic/linux/rtnetlink.h CONFLICT (add/add): Merge conflict in src/basic/linux/rtnetlink.h Auto-merging src/basic/linux/pkt_sched.h CONFLICT (add/add): Merge conflict in src/basic/linux/pkt_sched.h Auto-merging src/basic/linux/nexthop.h CONFLICT (add/add): Merge conflict in src/basic/linux/nexthop.h Auto-merging src/basic/linux/netlink.h CONFLICT (add/add): Merge conflict in src/basic/linux/netlink.h Auto-merging src/basic/linux/in6.h CONFLICT (add/add): Merge conflict in src/basic/linux/in6.h Auto-merging src/basic/linux/in.h CONFLICT (add/add): Merge conflict in src/basic/linux/in.h Auto-merging src/basic/linux/if_macsec.h CONFLICT (add/add): Merge conflict in src/basic/linux/if_macsec.h Auto-merging src/basic/linux/if_link.h CONFLICT (add/add): Merge conflict in src/basic/linux/if_link.h Auto-merging src/basic/linux/if_ether.h CONFLICT (add/add): Merge conflict in src/basic/linux/if_ether.h Auto-merging src/basic/linux/if_bridge.h CONFLICT (add/add): Merge conflict in src/basic/linux/if_bridge.h Auto-merging src/basic/linux/if.h CONFLICT (add/add): Merge conflict in src/basic/linux/if.h Auto-merging src/basic/linux/btrfs_tree.h CONFLICT (add/add): Merge conflict in src/basic/linux/btrfs_tree.h Auto-merging src/basic/linux/btrfs.h CONFLICT (add/add): Merge conflict in src/basic/linux/btrfs.h Auto-merging src/basic/limits-util.h CONFLICT (add/add): Merge conflict in src/basic/limits-util.h Auto-merging src/basic/limits-util.c CONFLICT (add/add): Merge conflict in src/basic/limits-util.c Auto-merging src/basic/label.h CONFLICT (add/add): Merge conflict in src/basic/label.h Auto-merging src/basic/label.c CONFLICT (add/add): Merge conflict in src/basic/label.c Auto-merging src/basic/khash.h CONFLICT (add/add): Merge conflict in src/basic/khash.h Auto-merging src/basic/khash.c CONFLICT (add/add): Merge conflict in src/basic/khash.c Auto-merging src/basic/kbd-util.h CONFLICT (add/add): Merge conflict in src/basic/kbd-util.h Auto-merging src/basic/kbd-util.c CONFLICT (add/add): Merge conflict in src/basic/kbd-util.c Auto-merging src/basic/io-util.h CONFLICT (add/add): Merge conflict in src/basic/io-util.h Auto-merging src/basic/io-util.c CONFLICT (add/add): Merge conflict in src/basic/io-util.c Auto-merging src/basic/in-addr-util.h CONFLICT (add/add): Merge conflict in src/basic/in-addr-util.h Auto-merging src/basic/in-addr-util.c CONFLICT (add/add): Merge conflict in src/basic/in-addr-util.c Auto-merging src/basic/hostname-util.h CONFLICT (add/add): Merge conflict in src/basic/hostname-util.h Auto-merging src/basic/hostname-util.c CONFLICT (add/add): Merge conflict in src/basic/hostname-util.c Auto-merging src/basic/hexdecoct.h CONFLICT (add/add): Merge conflict in src/basic/hexdecoct.h Auto-merging src/basic/hexdecoct.c CONFLICT (add/add): Merge conflict in src/basic/hexdecoct.c Auto-merging src/basic/hashmap.h CONFLICT (add/add): Merge conflict in src/basic/hashmap.h Auto-merging src/basic/hashmap.c CONFLICT (add/add): Merge conflict in src/basic/hashmap.c Auto-merging src/basic/hash-funcs.h CONFLICT (add/add): Merge conflict in src/basic/hash-funcs.h Auto-merging src/basic/hash-funcs.c CONFLICT (add/add): Merge conflict in src/basic/hash-funcs.c Auto-merging src/basic/gunicode.h CONFLICT (add/add): Merge conflict in src/basic/gunicode.h Auto-merging src/basic/gunicode.c CONFLICT (add/add): Merge conflict in src/basic/gunicode.c Auto-merging src/basic/glob-util.h CONFLICT (add/add): Merge conflict in src/basic/glob-util.h Auto-merging src/basic/glob-util.c CONFLICT (add/add): Merge conflict in src/basic/glob-util.c Auto-merging src/basic/gcrypt-util.h CONFLICT (add/add): Merge conflict in src/basic/gcrypt-util.h Auto-merging src/basic/gcrypt-util.c CONFLICT (add/add): Merge conflict in src/basic/gcrypt-util.c Auto-merging src/basic/fs-util.h CONFLICT (add/add): Merge conflict in src/basic/fs-util.h Auto-merging src/basic/fs-util.c CONFLICT (add/add): Merge conflict in src/basic/fs-util.c Auto-merging src/basic/format-util.h CONFLICT (add/add): Merge conflict in src/basic/format-util.h Auto-merging src/basic/format-util.c CONFLICT (add/add): Merge conflict in src/basic/format-util.c Auto-merging src/basic/fileio.h CONFLICT (add/add): Merge conflict in src/basic/fileio.h Auto-merging src/basic/fileio.c CONFLICT (add/add): Merge conflict in src/basic/fileio.c Auto-merging src/basic/fd-util.h CONFLICT (add/add): Merge conflict in src/basic/fd-util.h Auto-merging src/basic/fd-util.c CONFLICT (add/add): Merge conflict in src/basic/fd-util.c Auto-merging src/basic/extract-word.h CONFLICT (add/add): Merge conflict in src/basic/extract-word.h Auto-merging src/basic/extract-word.c CONFLICT (add/add): Merge conflict in src/basic/extract-word.c Auto-merging src/basic/ether-addr-util.h CONFLICT (add/add): Merge conflict in src/basic/ether-addr-util.h Auto-merging src/basic/ether-addr-util.c CONFLICT (add/add): Merge conflict in src/basic/ether-addr-util.c Auto-merging src/basic/escape.h CONFLICT (add/add): Merge conflict in src/basic/escape.h Auto-merging src/basic/escape.c CONFLICT (add/add): Merge conflict in src/basic/escape.c Auto-merging src/basic/errno-util.h CONFLICT (add/add): Merge conflict in src/basic/errno-util.h Auto-merging src/basic/errno-list.h CONFLICT (add/add): Merge conflict in src/basic/errno-list.h Auto-merging src/basic/errno-list.c CONFLICT (add/add): Merge conflict in src/basic/errno-list.c Auto-merging src/basic/env-util.h CONFLICT (add/add): Merge conflict in src/basic/env-util.h Auto-merging src/basic/env-util.c CONFLICT (add/add): Merge conflict in src/basic/env-util.c Auto-merging src/basic/env-file.h CONFLICT (add/add): Merge conflict in src/basic/env-file.h Auto-merging src/basic/env-file.c CONFLICT (add/add): Merge conflict in src/basic/env-file.c Auto-merging src/basic/efivars.h CONFLICT (add/add): Merge conflict in src/basic/efivars.h Auto-merging src/basic/efivars.c CONFLICT (add/add): Merge conflict in src/basic/efivars.c Auto-merging src/basic/dirent-util.h CONFLICT (add/add): Merge conflict in src/basic/dirent-util.h Auto-merging src/basic/dirent-util.c CONFLICT (add/add): Merge conflict in src/basic/dirent-util.c Auto-merging src/basic/device-nodes.h CONFLICT (add/add): Merge conflict in src/basic/device-nodes.h Auto-merging src/basic/device-nodes.c CONFLICT (add/add): Merge conflict in src/basic/device-nodes.c Auto-merging src/basic/def.h CONFLICT (add/add): Merge conflict in src/basic/def.h Auto-merging src/basic/copy.h CONFLICT (add/add): Merge conflict in src/basic/copy.h Auto-merging src/basic/copy.c CONFLICT (add/add): Merge conflict in src/basic/copy.c Auto-merging src/basic/conf-files.h CONFLICT (add/add): Merge conflict in src/basic/conf-files.h Auto-merging src/basic/conf-files.c CONFLICT (add/add): Merge conflict in src/basic/conf-files.c Auto-merging src/basic/chattr-util.h CONFLICT (add/add): Merge conflict in src/basic/chattr-util.h Auto-merging src/basic/chattr-util.c CONFLICT (add/add): Merge conflict in src/basic/chattr-util.c Auto-merging src/basic/cgroup-util.h CONFLICT (add/add): Merge conflict in src/basic/cgroup-util.h Auto-merging src/basic/cgroup-util.c CONFLICT (add/add): Merge conflict in src/basic/cgroup-util.c Auto-merging src/basic/capability-util.h CONFLICT (add/add): Merge conflict in src/basic/capability-util.h Auto-merging src/basic/capability-util.c CONFLICT (add/add): Merge conflict in src/basic/capability-util.c Auto-merging src/basic/cap-list.h CONFLICT (add/add): Merge conflict in src/basic/cap-list.h Auto-merging src/basic/cap-list.c CONFLICT (add/add): Merge conflict in src/basic/cap-list.c Auto-merging src/basic/bus-label.h CONFLICT (add/add): Merge conflict in src/basic/bus-label.h Auto-merging src/basic/bus-label.c CONFLICT (add/add): Merge conflict in src/basic/bus-label.c Auto-merging src/basic/build.h CONFLICT (add/add): Merge conflict in src/basic/build.h Auto-merging src/basic/btrfs-util.h CONFLICT (add/add): Merge conflict in src/basic/btrfs-util.h Auto-merging src/basic/btrfs-util.c CONFLICT (add/add): Merge conflict in src/basic/btrfs-util.c Auto-merging src/basic/blockdev-util.h CONFLICT (add/add): Merge conflict in src/basic/blockdev-util.h Auto-merging src/basic/blockdev-util.c CONFLICT (add/add): Merge conflict in src/basic/blockdev-util.c Auto-merging src/basic/audit-util.h CONFLICT (add/add): Merge conflict in src/basic/audit-util.h Auto-merging src/basic/audit-util.c CONFLICT (add/add): Merge conflict in src/basic/audit-util.c Auto-merging src/basic/async.h CONFLICT (add/add): Merge conflict in src/basic/async.h Auto-merging src/basic/async.c CONFLICT (add/add): Merge conflict in src/basic/async.c Auto-merging src/basic/arphrd-list.h CONFLICT (add/add): Merge conflict in src/basic/arphrd-list.h Auto-merging src/basic/arphrd-list.c CONFLICT (add/add): Merge conflict in src/basic/arphrd-list.c Auto-merging src/basic/architecture.h CONFLICT (add/add): Merge conflict in src/basic/architecture.h Auto-merging src/basic/architecture.c CONFLICT (add/add): Merge conflict in src/basic/architecture.c Auto-merging src/basic/alloc-util.h CONFLICT (add/add): Merge conflict in src/basic/alloc-util.h Auto-merging src/basic/alloc-util.c CONFLICT (add/add): Merge conflict in src/basic/alloc-util.c Auto-merging src/basic/af-list.h CONFLICT (add/add): Merge conflict in src/basic/af-list.h Auto-merging src/basic/af-list.c CONFLICT (add/add): Merge conflict in src/basic/af-list.c Auto-merging src/basic/MurmurHash2.h CONFLICT (add/add): Merge conflict in src/basic/MurmurHash2.h Auto-merging src/basic/MurmurHash2.c CONFLICT (add/add): Merge conflict in src/basic/MurmurHash2.c Auto-merging src/backlight/backlight.c CONFLICT (add/add): Merge conflict in src/backlight/backlight.c Auto-merging src/ask-password/ask-password.c CONFLICT (add/add): Merge conflict in src/ask-password/ask-password.c Auto-merging src/analyze/test-verify.c CONFLICT (add/add): Merge conflict in src/analyze/test-verify.c Auto-merging src/analyze/meson.build CONFLICT (add/add): Merge conflict in src/analyze/meson.build Auto-merging src/analyze/analyze.c CONFLICT (add/add): Merge conflict in src/analyze/analyze.c Auto-merging src/analyze/analyze-verify.h CONFLICT (add/add): Merge conflict in src/analyze/analyze-verify.h Auto-merging src/analyze/analyze-verify.c CONFLICT (add/add): Merge conflict in src/analyze/analyze-verify.c Auto-merging src/analyze/analyze-security.h CONFLICT (add/add): Merge conflict in src/analyze/analyze-security.h Auto-merging src/analyze/analyze-security.c CONFLICT (add/add): Merge conflict in src/analyze/analyze-security.c Auto-merging src/analyze/analyze-condition.h CONFLICT (add/add): Merge conflict in src/analyze/analyze-condition.h Auto-merging src/analyze/analyze-condition.c CONFLICT (add/add): Merge conflict in src/analyze/analyze-condition.c Auto-merging src/activate/activate.c CONFLICT (add/add): Merge conflict in src/activate/activate.c Auto-merging src/ac-power/ac-power.c CONFLICT (add/add): Merge conflict in src/ac-power/ac-power.c Auto-merging shell-completion/zsh/meson.build CONFLICT (add/add): Merge conflict in shell-completion/zsh/meson.build Auto-merging shell-completion/zsh/_udevadm CONFLICT (add/add): Merge conflict in shell-completion/zsh/_udevadm Auto-merging shell-completion/zsh/_timedatectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_timedatectl Auto-merging shell-completion/zsh/_systemd-tmpfiles CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-tmpfiles Auto-merging shell-completion/zsh/_systemd-run CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-run Auto-merging shell-completion/zsh/_systemd-nspawn CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-nspawn Auto-merging shell-completion/zsh/_systemd-inhibit CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-inhibit Auto-merging shell-completion/zsh/_systemd-delta CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-delta Auto-merging shell-completion/zsh/_systemd-analyze CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-analyze Auto-merging shell-completion/zsh/_systemd CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd Auto-merging shell-completion/zsh/_systemctl.in CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemctl.in Auto-merging shell-completion/zsh/_sd_unit_files CONFLICT (add/add): Merge conflict in shell-completion/zsh/_sd_unit_files Auto-merging shell-completion/zsh/_sd_outputmodes CONFLICT (add/add): Merge conflict in shell-completion/zsh/_sd_outputmodes Auto-merging shell-completion/zsh/_sd_machines CONFLICT (add/add): Merge conflict in shell-completion/zsh/_sd_machines Auto-merging shell-completion/zsh/_sd_hosts_or_user_at_host CONFLICT (add/add): Merge conflict in shell-completion/zsh/_sd_hosts_or_user_at_host Auto-merging shell-completion/zsh/_resolvectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_resolvectl Auto-merging shell-completion/zsh/_networkctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_networkctl Auto-merging shell-completion/zsh/_machinectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_machinectl Auto-merging shell-completion/zsh/_loginctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_loginctl Auto-merging shell-completion/zsh/_localectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_localectl Auto-merging shell-completion/zsh/_kernel-install CONFLICT (add/add): Merge conflict in shell-completion/zsh/_kernel-install Auto-merging shell-completion/zsh/_journalctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_journalctl Auto-merging shell-completion/zsh/_hostnamectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_hostnamectl Auto-merging shell-completion/zsh/_coredumpctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_coredumpctl Auto-merging shell-completion/zsh/_busctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_busctl Auto-merging shell-completion/zsh/_bootctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_bootctl Auto-merging shell-completion/bash/udevadm CONFLICT (add/add): Merge conflict in shell-completion/bash/udevadm Auto-merging shell-completion/bash/timedatectl CONFLICT (add/add): Merge conflict in shell-completion/bash/timedatectl Auto-merging shell-completion/bash/systemd-run CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-run Auto-merging shell-completion/bash/systemd-resolve CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-resolve Auto-merging shell-completion/bash/systemd-path CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-path Auto-merging shell-completion/bash/systemd-nspawn CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-nspawn Auto-merging shell-completion/bash/systemd-id128 CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-id128 Auto-merging shell-completion/bash/systemd-detect-virt CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-detect-virt Auto-merging shell-completion/bash/systemd-delta CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-delta Auto-merging shell-completion/bash/systemd-cgtop CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-cgtop Auto-merging shell-completion/bash/systemd-cgls CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-cgls Auto-merging shell-completion/bash/systemd-cat CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-cat Auto-merging shell-completion/bash/systemd-analyze CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-analyze Auto-merging shell-completion/bash/systemctl.in CONFLICT (add/add): Merge conflict in shell-completion/bash/systemctl.in Auto-merging shell-completion/bash/resolvectl CONFLICT (add/add): Merge conflict in shell-completion/bash/resolvectl Auto-merging shell-completion/bash/portablectl CONFLICT (add/add): Merge conflict in shell-completion/bash/portablectl Auto-merging shell-completion/bash/networkctl CONFLICT (add/add): Merge conflict in shell-completion/bash/networkctl Auto-merging shell-completion/bash/meson.build CONFLICT (add/add): Merge conflict in shell-completion/bash/meson.build Auto-merging shell-completion/bash/machinectl CONFLICT (add/add): Merge conflict in shell-completion/bash/machinectl Auto-merging shell-completion/bash/loginctl CONFLICT (add/add): Merge conflict in shell-completion/bash/loginctl Auto-merging shell-completion/bash/localectl CONFLICT (add/add): Merge conflict in shell-completion/bash/localectl Auto-merging shell-completion/bash/kernel-install CONFLICT (add/add): Merge conflict in shell-completion/bash/kernel-install Auto-merging shell-completion/bash/journalctl CONFLICT (add/add): Merge conflict in shell-completion/bash/journalctl Auto-merging shell-completion/bash/hostnamectl CONFLICT (add/add): Merge conflict in shell-completion/bash/hostnamectl Auto-merging shell-completion/bash/coredumpctl CONFLICT (add/add): Merge conflict in shell-completion/bash/coredumpctl Auto-merging shell-completion/bash/busctl CONFLICT (add/add): Merge conflict in shell-completion/bash/busctl Auto-merging shell-completion/bash/bootctl CONFLICT (add/add): Merge conflict in shell-completion/bash/bootctl Auto-merging semaphoreci/semaphore-runner.sh CONFLICT (add/add): Merge conflict in semaphoreci/semaphore-runner.sh Auto-merging rules.d/meson.build CONFLICT (add/add): Merge conflict in rules.d/meson.build Auto-merging rules.d/99-systemd.rules.in CONFLICT (add/add): Merge conflict in rules.d/99-systemd.rules.in Auto-merging rules.d/80-net-setup-link.rules CONFLICT (add/add): Merge conflict in rules.d/80-net-setup-link.rules Auto-merging rules.d/60-serial.rules CONFLICT (add/add): Merge conflict in rules.d/60-serial.rules Auto-merging rules.d/60-persistent-storage.rules CONFLICT (add/add): Merge conflict in rules.d/60-persistent-storage.rules Auto-merging rules.d/60-fido-id.rules CONFLICT (add/add): Merge conflict in rules.d/60-fido-id.rules Auto-merging rules.d/50-udev-default.rules.in CONFLICT (add/add): Merge conflict in rules.d/50-udev-default.rules.in Auto-merging presets/user/90-systemd.preset CONFLICT (add/add): Merge conflict in presets/user/90-systemd.preset Auto-merging presets/meson.build CONFLICT (add/add): Merge conflict in presets/meson.build Auto-merging presets/90-systemd.preset CONFLICT (add/add): Merge conflict in presets/90-systemd.preset Auto-merging po/zh_TW.po CONFLICT (add/add): Merge conflict in po/zh_TW.po Auto-merging po/zh_CN.po CONFLICT (add/add): Merge conflict in po/zh_CN.po Auto-merging po/uk.po CONFLICT (add/add): Merge conflict in po/uk.po Auto-merging po/tr.po CONFLICT (add/add): Merge conflict in po/tr.po Auto-merging po/sv.po CONFLICT (add/add): Merge conflict in po/sv.po Auto-merging po/sr.po CONFLICT (add/add): Merge conflict in po/sr.po Auto-merging po/sk.po CONFLICT (add/add): Merge conflict in po/sk.po Auto-merging po/ru.po CONFLICT (add/add): Merge conflict in po/ru.po Auto-merging po/ro.po CONFLICT (add/add): Merge conflict in po/ro.po Auto-merging po/pt_BR.po CONFLICT (add/add): Merge conflict in po/pt_BR.po Auto-merging po/pl.po CONFLICT (add/add): Merge conflict in po/pl.po Auto-merging po/meson.build CONFLICT (add/add): Merge conflict in po/meson.build Auto-merging po/lt.po CONFLICT (add/add): Merge conflict in po/lt.po Auto-merging po/ko.po CONFLICT (add/add): Merge conflict in po/ko.po Auto-merging po/ja.po CONFLICT (add/add): Merge conflict in po/ja.po Auto-merging po/it.po CONFLICT (add/add): Merge conflict in po/it.po Auto-merging po/id.po CONFLICT (add/add): Merge conflict in po/id.po Auto-merging po/hu.po CONFLICT (add/add): Merge conflict in po/hu.po Auto-merging po/hr.po CONFLICT (add/add): Merge conflict in po/hr.po Auto-merging po/gl.po CONFLICT (add/add): Merge conflict in po/gl.po Auto-merging po/fr.po CONFLICT (add/add): Merge conflict in po/fr.po Auto-merging po/es.po CONFLICT (add/add): Merge conflict in po/es.po Auto-merging po/el.po CONFLICT (add/add): Merge conflict in po/el.po Auto-merging po/de.po CONFLICT (add/add): Merge conflict in po/de.po Auto-merging po/da.po CONFLICT (add/add): Merge conflict in po/da.po Auto-merging po/cs.po CONFLICT (add/add): Merge conflict in po/cs.po Auto-merging po/ca.po CONFLICT (add/add): Merge conflict in po/ca.po Auto-merging po/bg.po CONFLICT (add/add): Merge conflict in po/bg.po Auto-merging po/be@latin.po CONFLICT (add/add): Merge conflict in po/be@latin.po Auto-merging po/be.po CONFLICT (add/add): Merge conflict in po/be.po Auto-merging po/POTFILES.skip CONFLICT (add/add): Merge conflict in po/POTFILES.skip Auto-merging po/POTFILES.in CONFLICT (add/add): Merge conflict in po/POTFILES.in Auto-merging network/meson.build CONFLICT (add/add): Merge conflict in network/meson.build Auto-merging network/99-default.link CONFLICT (add/add): Merge conflict in network/99-default.link Auto-merging network/80-vm-vt.network CONFLICT (add/add): Merge conflict in network/80-vm-vt.network Auto-merging network/80-container-vz.network CONFLICT (add/add): Merge conflict in network/80-container-vz.network Auto-merging network/80-container-ve.network CONFLICT (add/add): Merge conflict in network/80-container-ve.network Auto-merging network/80-container-host0.network CONFLICT (add/add): Merge conflict in network/80-container-host0.network Auto-merging modprobe.d/systemd.conf CONFLICT (add/add): Merge conflict in modprobe.d/systemd.conf Auto-merging meson_options.txt CONFLICT (add/add): Merge conflict in meson_options.txt Auto-merging meson.build CONFLICT (add/add): Merge conflict in meson.build Auto-merging man/vconsole.conf.xml CONFLICT (add/add): Merge conflict in man/vconsole.conf.xml Auto-merging man/userdbctl.xml CONFLICT (add/add): Merge conflict in man/userdbctl.xml Auto-merging man/user@.service.xml CONFLICT (add/add): Merge conflict in man/user@.service.xml Auto-merging man/user-system-options.xml CONFLICT (add/add): Merge conflict in man/user-system-options.xml Auto-merging man/udevadm.xml CONFLICT (add/add): Merge conflict in man/udevadm.xml Auto-merging man/udev_new.xml CONFLICT (add/add): Merge conflict in man/udev_new.xml Auto-merging man/udev_monitor_receive_device.xml CONFLICT (add/add): Merge conflict in man/udev_monitor_receive_device.xml Auto-merging man/udev_monitor_new_from_netlink.xml CONFLICT (add/add): Merge conflict in man/udev_monitor_new_from_netlink.xml Auto-merging man/udev_monitor_filter_update.xml CONFLICT (add/add): Merge conflict in man/udev_monitor_filter_update.xml Auto-merging man/udev_list_entry.xml CONFLICT (add/add): Merge conflict in man/udev_list_entry.xml Auto-merging man/udev_enumerate_scan_devices.xml CONFLICT (add/add): Merge conflict in man/udev_enumerate_scan_devices.xml Auto-merging man/udev_enumerate_new.xml CONFLICT (add/add): Merge conflict in man/udev_enumerate_new.xml Auto-merging man/udev_enumerate_add_match_subsystem.xml CONFLICT (add/add): Merge conflict in man/udev_enumerate_add_match_subsystem.xml Auto-merging man/udev_device_new_from_syspath.xml CONFLICT (add/add): Merge conflict in man/udev_device_new_from_syspath.xml Auto-merging man/udev_device_has_tag.xml CONFLICT (add/add): Merge conflict in man/udev_device_has_tag.xml Auto-merging man/udev_device_get_syspath.xml CONFLICT (add/add): Merge conflict in man/udev_device_get_syspath.xml Auto-merging man/udev.xml CONFLICT (add/add): Merge conflict in man/udev.xml Auto-merging man/udev.conf.xml CONFLICT (add/add): Merge conflict in man/udev.conf.xml Auto-merging man/tmpfiles.d.xml CONFLICT (add/add): Merge conflict in man/tmpfiles.d.xml Auto-merging man/timesyncd.conf.xml CONFLICT (add/add): Merge conflict in man/timesyncd.conf.xml Auto-merging man/timedatectl.xml CONFLICT (add/add): Merge conflict in man/timedatectl.xml Auto-merging man/threads-aware.xml CONFLICT (add/add): Merge conflict in man/threads-aware.xml Auto-merging man/telinit.xml CONFLICT (add/add): Merge conflict in man/telinit.xml Auto-merging man/tc.xml CONFLICT (add/add): Merge conflict in man/tc.xml Auto-merging man/sysusers.d.xml CONFLICT (add/add): Merge conflict in man/sysusers.d.xml Auto-merging man/systemd.xml CONFLICT (add/add): Merge conflict in man/systemd.xml Auto-merging man/systemd.unit.xml CONFLICT (add/add): Merge conflict in man/systemd.unit.xml Auto-merging man/systemd.timer.xml CONFLICT (add/add): Merge conflict in man/systemd.timer.xml Auto-merging man/systemd.time.xml CONFLICT (add/add): Merge conflict in man/systemd.time.xml Auto-merging man/systemd.target.xml CONFLICT (add/add): Merge conflict in man/systemd.target.xml Auto-merging man/systemd.syntax.xml CONFLICT (add/add): Merge conflict in man/systemd.syntax.xml Auto-merging man/systemd.swap.xml CONFLICT (add/add): Merge conflict in man/systemd.swap.xml Auto-merging man/systemd.special.xml CONFLICT (add/add): Merge conflict in man/systemd.special.xml Auto-merging man/systemd.socket.xml CONFLICT (add/add): Merge conflict in man/systemd.socket.xml Auto-merging man/systemd.slice.xml CONFLICT (add/add): Merge conflict in man/systemd.slice.xml Auto-merging man/systemd.service.xml CONFLICT (add/add): Merge conflict in man/systemd.service.xml Auto-merging man/systemd.scope.xml CONFLICT (add/add): Merge conflict in man/systemd.scope.xml Auto-merging man/systemd.resource-control.xml CONFLICT (add/add): Merge conflict in man/systemd.resource-control.xml Auto-merging man/systemd.preset.xml CONFLICT (add/add): Merge conflict in man/systemd.preset.xml Auto-merging man/systemd.path.xml CONFLICT (add/add): Merge conflict in man/systemd.path.xml Auto-merging man/systemd.offline-updates.xml CONFLICT (add/add): Merge conflict in man/systemd.offline-updates.xml Auto-merging man/systemd.nspawn.xml CONFLICT (add/add): Merge conflict in man/systemd.nspawn.xml Auto-merging man/systemd.network.xml CONFLICT (add/add): Merge conflict in man/systemd.network.xml Auto-merging man/systemd.netdev.xml CONFLICT (add/add): Merge conflict in man/systemd.netdev.xml Auto-merging man/systemd.net-naming-scheme.xml CONFLICT (add/add): Merge conflict in man/systemd.net-naming-scheme.xml Auto-merging man/systemd.mount.xml CONFLICT (add/add): Merge conflict in man/systemd.mount.xml Auto-merging man/systemd.link.xml CONFLICT (add/add): Merge conflict in man/systemd.link.xml Auto-merging man/systemd.kill.xml CONFLICT (add/add): Merge conflict in man/systemd.kill.xml Auto-merging man/systemd.journal-fields.xml CONFLICT (add/add): Merge conflict in man/systemd.journal-fields.xml Auto-merging man/systemd.generator.xml CONFLICT (add/add): Merge conflict in man/systemd.generator.xml Auto-merging man/systemd.exec.xml CONFLICT (add/add): Merge conflict in man/systemd.exec.xml Auto-merging man/systemd.environment-generator.xml CONFLICT (add/add): Merge conflict in man/systemd.environment-generator.xml Auto-merging man/systemd.dnssd.xml CONFLICT (add/add): Merge conflict in man/systemd.dnssd.xml Auto-merging man/systemd.device.xml CONFLICT (add/add): Merge conflict in man/systemd.device.xml Auto-merging man/systemd.automount.xml CONFLICT (add/add): Merge conflict in man/systemd.automount.xml Auto-merging man/systemd-xdg-autostart-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-xdg-autostart-generator.xml Auto-merging man/systemd-volatile-root.service.xml CONFLICT (add/add): Merge conflict in man/systemd-volatile-root.service.xml Auto-merging man/systemd-veritysetup@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-veritysetup@.service.xml Auto-merging man/systemd-veritysetup-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-veritysetup-generator.xml Auto-merging man/systemd-vconsole-setup.service.xml CONFLICT (add/add): Merge conflict in man/systemd-vconsole-setup.service.xml Auto-merging man/systemd-userdbd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-userdbd.service.xml Auto-merging man/systemd-user-sessions.service.xml CONFLICT (add/add): Merge conflict in man/systemd-user-sessions.service.xml Auto-merging man/systemd-update-utmp.service.xml CONFLICT (add/add): Merge conflict in man/systemd-update-utmp.service.xml Auto-merging man/systemd-update-done.service.xml CONFLICT (add/add): Merge conflict in man/systemd-update-done.service.xml Auto-merging man/systemd-udevd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-udevd.service.xml Auto-merging man/systemd-udev-settle.service.xml CONFLICT (add/add): Merge conflict in man/systemd-udev-settle.service.xml Auto-merging man/systemd-tty-ask-password-agent.xml CONFLICT (add/add): Merge conflict in man/systemd-tty-ask-password-agent.xml Auto-merging man/systemd-tmpfiles.xml CONFLICT (add/add): Merge conflict in man/systemd-tmpfiles.xml Auto-merging man/systemd-timesyncd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-timesyncd.service.xml Auto-merging man/systemd-timedated.service.xml CONFLICT (add/add): Merge conflict in man/systemd-timedated.service.xml Auto-merging man/systemd-time-wait-sync.service.xml CONFLICT (add/add): Merge conflict in man/systemd-time-wait-sync.service.xml Auto-merging man/systemd-sysv-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-sysv-generator.xml Auto-merging man/systemd-sysusers.xml CONFLICT (add/add): Merge conflict in man/systemd-sysusers.xml Auto-merging man/systemd-system.conf.xml CONFLICT (add/add): Merge conflict in man/systemd-system.conf.xml Auto-merging man/systemd-system-update-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-system-update-generator.xml Auto-merging man/systemd-sysctl.service.xml CONFLICT (add/add): Merge conflict in man/systemd-sysctl.service.xml Auto-merging man/systemd-suspend.service.xml CONFLICT (add/add): Merge conflict in man/systemd-suspend.service.xml Auto-merging man/systemd-socket-proxyd.xml CONFLICT (add/add): Merge conflict in man/systemd-socket-proxyd.xml Auto-merging man/systemd-socket-activate.xml CONFLICT (add/add): Merge conflict in man/systemd-socket-activate.xml Auto-merging man/systemd-sleep.conf.xml CONFLICT (add/add): Merge conflict in man/systemd-sleep.conf.xml Auto-merging man/systemd-run.xml CONFLICT (add/add): Merge conflict in man/systemd-run.xml Auto-merging man/systemd-run-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-run-generator.xml Auto-merging man/systemd-rfkill.service.xml CONFLICT (add/add): Merge conflict in man/systemd-rfkill.service.xml Auto-merging man/systemd-resolved.service.xml CONFLICT (add/add): Merge conflict in man/systemd-resolved.service.xml Auto-merging man/systemd-repart.xml CONFLICT (add/add): Merge conflict in man/systemd-repart.xml Auto-merging man/systemd-remount-fs.service.xml CONFLICT (add/add): Merge conflict in man/systemd-remount-fs.service.xml Auto-merging man/systemd-rc-local-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-rc-local-generator.xml Auto-merging man/systemd-random-seed.service.xml CONFLICT (add/add): Merge conflict in man/systemd-random-seed.service.xml Auto-merging man/systemd-quotacheck.service.xml CONFLICT (add/add): Merge conflict in man/systemd-quotacheck.service.xml Auto-merging man/systemd-pstore.service.xml CONFLICT (add/add): Merge conflict in man/systemd-pstore.service.xml Auto-merging man/systemd-portabled.service.xml CONFLICT (add/add): Merge conflict in man/systemd-portabled.service.xml Auto-merging man/systemd-path.xml CONFLICT (add/add): Merge conflict in man/systemd-path.xml Auto-merging man/systemd-nspawn.xml CONFLICT (add/add): Merge conflict in man/systemd-nspawn.xml Auto-merging man/systemd-notify.xml CONFLICT (add/add): Merge conflict in man/systemd-notify.xml Auto-merging man/systemd-networkd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-networkd.service.xml Auto-merging man/systemd-networkd-wait-online.service.xml CONFLICT (add/add): Merge conflict in man/systemd-networkd-wait-online.service.xml Auto-merging man/systemd-network-generator.service.xml CONFLICT (add/add): Merge conflict in man/systemd-network-generator.service.xml Auto-merging man/systemd-mount.xml CONFLICT (add/add): Merge conflict in man/systemd-mount.xml Auto-merging man/systemd-modules-load.service.xml CONFLICT (add/add): Merge conflict in man/systemd-modules-load.service.xml Auto-merging man/systemd-makefs@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-makefs@.service.xml Auto-merging man/systemd-machined.service.xml CONFLICT (add/add): Merge conflict in man/systemd-machined.service.xml Auto-merging man/systemd-machine-id-setup.xml CONFLICT (add/add): Merge conflict in man/systemd-machine-id-setup.xml Auto-merging man/systemd-machine-id-commit.service.xml CONFLICT (add/add): Merge conflict in man/systemd-machine-id-commit.service.xml Auto-merging man/systemd-logind.service.xml CONFLICT (add/add): Merge conflict in man/systemd-logind.service.xml Auto-merging man/systemd-localed.service.xml CONFLICT (add/add): Merge conflict in man/systemd-localed.service.xml Auto-merging man/systemd-journald.service.xml CONFLICT (add/add): Merge conflict in man/systemd-journald.service.xml Auto-merging man/systemd-journal-upload.service.xml CONFLICT (add/add): Merge conflict in man/systemd-journal-upload.service.xml Auto-merging man/systemd-journal-remote.service.xml CONFLICT (add/add): Merge conflict in man/systemd-journal-remote.service.xml Auto-merging man/systemd-journal-gatewayd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-journal-gatewayd.service.xml Auto-merging man/systemd-initctl.service.xml CONFLICT (add/add): Merge conflict in man/systemd-initctl.service.xml Auto-merging man/systemd-inhibit.xml CONFLICT (add/add): Merge conflict in man/systemd-inhibit.xml Auto-merging man/systemd-importd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-importd.service.xml Auto-merging man/systemd-id128.xml CONFLICT (add/add): Merge conflict in man/systemd-id128.xml Auto-merging man/systemd-hwdb.xml CONFLICT (add/add): Merge conflict in man/systemd-hwdb.xml Auto-merging man/systemd-hostnamed.service.xml CONFLICT (add/add): Merge conflict in man/systemd-hostnamed.service.xml Auto-merging man/systemd-homed.service.xml CONFLICT (add/add): Merge conflict in man/systemd-homed.service.xml Auto-merging man/systemd-hibernate-resume@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-hibernate-resume@.service.xml Auto-merging man/systemd-hibernate-resume-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-hibernate-resume-generator.xml Auto-merging man/systemd-halt.service.xml CONFLICT (add/add): Merge conflict in man/systemd-halt.service.xml Auto-merging man/systemd-gpt-auto-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-gpt-auto-generator.xml Auto-merging man/systemd-getty-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-getty-generator.xml Auto-merging man/systemd-fstab-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-fstab-generator.xml Auto-merging man/systemd-fsck@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-fsck@.service.xml Auto-merging man/systemd-firstboot.xml CONFLICT (add/add): Merge conflict in man/systemd-firstboot.xml Auto-merging man/systemd-escape.xml CONFLICT (add/add): Merge conflict in man/systemd-escape.xml Auto-merging man/systemd-environment-d-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-environment-d-generator.xml Auto-merging man/systemd-detect-virt.xml CONFLICT (add/add): Merge conflict in man/systemd-detect-virt.xml Auto-merging man/systemd-delta.xml CONFLICT (add/add): Merge conflict in man/systemd-delta.xml Auto-merging man/systemd-debug-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-debug-generator.xml Auto-merging man/systemd-cryptsetup@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-cryptsetup@.service.xml Auto-merging man/systemd-cryptsetup-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-cryptsetup-generator.xml Auto-merging man/systemd-coredump.xml CONFLICT (add/add): Merge conflict in man/systemd-coredump.xml Auto-merging man/systemd-cgtop.xml CONFLICT (add/add): Merge conflict in man/systemd-cgtop.xml Auto-merging man/systemd-cgls.xml CONFLICT (add/add): Merge conflict in man/systemd-cgls.xml Auto-merging man/systemd-cat.xml CONFLICT (add/add): Merge conflict in man/systemd-cat.xml Auto-merging man/systemd-boot.xml CONFLICT (add/add): Merge conflict in man/systemd-boot.xml Auto-merging man/systemd-boot-system-token.service.xml CONFLICT (add/add): Merge conflict in man/systemd-boot-system-token.service.xml Auto-merging man/systemd-boot-check-no-failures.service.xml CONFLICT (add/add): Merge conflict in man/systemd-boot-check-no-failures.service.xml Auto-merging man/systemd-bless-boot.service.xml CONFLICT (add/add): Merge conflict in man/systemd-bless-boot.service.xml Auto-merging man/systemd-bless-boot-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-bless-boot-generator.xml Auto-merging man/systemd-binfmt.service.xml CONFLICT (add/add): Merge conflict in man/systemd-binfmt.service.xml Auto-merging man/systemd-backlight@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-backlight@.service.xml Auto-merging man/systemd-ask-password.xml CONFLICT (add/add): Merge conflict in man/systemd-ask-password.xml Auto-merging man/systemd-ask-password-console.service.xml CONFLICT (add/add): Merge conflict in man/systemd-ask-password-console.service.xml Auto-merging man/systemd-analyze.xml CONFLICT (add/add): Merge conflict in man/systemd-analyze.xml Auto-merging man/systemctl.xml CONFLICT (add/add): Merge conflict in man/systemctl.xml Auto-merging man/system-only.xml CONFLICT (add/add): Merge conflict in man/system-only.xml Auto-merging man/sysctl.d.xml CONFLICT (add/add): Merge conflict in man/sysctl.d.xml Auto-merging man/supported-controllers.xml CONFLICT (add/add): Merge conflict in man/supported-controllers.xml Auto-merging man/standard-specifiers.xml CONFLICT (add/add): Merge conflict in man/standard-specifiers.xml Auto-merging man/standard-options.xml CONFLICT (add/add): Merge conflict in man/standard-options.xml Auto-merging man/standard-conf.xml CONFLICT (add/add): Merge conflict in man/standard-conf.xml Auto-merging man/shutdown.xml CONFLICT (add/add): Merge conflict in man/shutdown.xml Auto-merging man/sd_watchdog_enabled.xml CONFLICT (add/add): Merge conflict in man/sd_watchdog_enabled.xml Auto-merging man/sd_uid_get_state.xml CONFLICT (add/add): Merge conflict in man/sd_uid_get_state.xml Auto-merging man/sd_session_is_active.xml CONFLICT (add/add): Merge conflict in man/sd_session_is_active.xml Auto-merging man/sd_seat_get_active.xml CONFLICT (add/add): Merge conflict in man/sd_seat_get_active.xml Auto-merging man/sd_pid_get_owner_uid.xml CONFLICT (add/add): Merge conflict in man/sd_pid_get_owner_uid.xml Auto-merging man/sd_path_lookup.xml CONFLICT (add/add): Merge conflict in man/sd_path_lookup.xml Auto-merging man/sd_notify.xml CONFLICT (add/add): Merge conflict in man/sd_notify.xml Auto-merging man/sd_machine_get_class.xml CONFLICT (add/add): Merge conflict in man/sd_machine_get_class.xml Auto-merging man/sd_login_monitor_new.xml CONFLICT (add/add): Merge conflict in man/sd_login_monitor_new.xml Auto-merging man/sd_listen_fds.xml CONFLICT (add/add): Merge conflict in man/sd_listen_fds.xml Auto-merging man/sd_journal_stream_fd.xml CONFLICT (add/add): Merge conflict in man/sd_journal_stream_fd.xml Auto-merging man/sd_journal_seek_head.xml CONFLICT (add/add): Merge conflict in man/sd_journal_seek_head.xml Auto-merging man/sd_journal_query_unique.xml CONFLICT (add/add): Merge conflict in man/sd_journal_query_unique.xml Auto-merging man/sd_journal_print.xml CONFLICT (add/add): Merge conflict in man/sd_journal_print.xml Auto-merging man/sd_journal_open.xml CONFLICT (add/add): Merge conflict in man/sd_journal_open.xml Auto-merging man/sd_journal_next.xml CONFLICT (add/add): Merge conflict in man/sd_journal_next.xml Auto-merging man/sd_journal_has_runtime_files.xml CONFLICT (add/add): Merge conflict in man/sd_journal_has_runtime_files.xml Auto-merging man/sd_journal_get_usage.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_usage.xml Auto-merging man/sd_journal_get_realtime_usec.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_realtime_usec.xml Auto-merging man/sd_journal_get_fd.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_fd.xml Auto-merging man/sd_journal_get_data.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_data.xml Auto-merging man/sd_journal_get_cutoff_realtime_usec.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_cutoff_realtime_usec.xml Auto-merging man/sd_journal_get_cursor.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_cursor.xml Auto-merging man/sd_journal_get_catalog.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_catalog.xml Auto-merging man/sd_journal_enumerate_fields.xml CONFLICT (add/add): Merge conflict in man/sd_journal_enumerate_fields.xml Auto-merging man/sd_journal_add_match.xml CONFLICT (add/add): Merge conflict in man/sd_journal_add_match.xml Auto-merging man/sd_is_fifo.xml CONFLICT (add/add): Merge conflict in man/sd_is_fifo.xml Auto-merging man/sd_id128_to_string.xml CONFLICT (add/add): Merge conflict in man/sd_id128_to_string.xml Auto-merging man/sd_id128_randomize.xml CONFLICT (add/add): Merge conflict in man/sd_id128_randomize.xml Auto-merging man/sd_id128_get_machine.xml CONFLICT (add/add): Merge conflict in man/sd_id128_get_machine.xml Auto-merging man/sd_hwdb_new.xml CONFLICT (add/add): Merge conflict in man/sd_hwdb_new.xml Auto-merging man/sd_hwdb_get.xml CONFLICT (add/add): Merge conflict in man/sd_hwdb_get.xml Auto-merging man/sd_get_seats.xml CONFLICT (add/add): Merge conflict in man/sd_get_seats.xml Auto-merging man/sd_event_wait.xml CONFLICT (add/add): Merge conflict in man/sd_event_wait.xml Auto-merging man/sd_event_source_unref.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_unref.xml Auto-merging man/sd_event_source_set_userdata.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_userdata.xml Auto-merging man/sd_event_source_set_priority.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_priority.xml Auto-merging man/sd_event_source_set_prepare.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_prepare.xml Auto-merging man/sd_event_source_set_floating.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_floating.xml Auto-merging man/sd_event_source_set_enabled.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_enabled.xml Auto-merging man/sd_event_source_set_destroy_callback.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_destroy_callback.xml Auto-merging man/sd_event_source_set_description.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_description.xml Auto-merging man/sd_event_source_get_pending.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_get_pending.xml Auto-merging man/sd_event_source_get_event.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_get_event.xml Auto-merging man/sd_event_set_watchdog.xml CONFLICT (add/add): Merge conflict in man/sd_event_set_watchdog.xml Auto-merging man/sd_event_run.xml CONFLICT (add/add): Merge conflict in man/sd_event_run.xml Auto-merging man/sd_event_now.xml CONFLICT (add/add): Merge conflict in man/sd_event_now.xml Auto-merging man/sd_event_new.xml CONFLICT (add/add): Merge conflict in man/sd_event_new.xml Auto-merging man/sd_event_get_fd.xml CONFLICT (add/add): Merge conflict in man/sd_event_get_fd.xml Auto-merging man/sd_event_exit.xml CONFLICT (add/add): Merge conflict in man/sd_event_exit.xml Auto-merging man/sd_event_add_time.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_time.xml Auto-merging man/sd_event_add_signal.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_signal.xml Auto-merging man/sd_event_add_io.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_io.xml Auto-merging man/sd_event_add_inotify.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_inotify.xml Auto-merging man/sd_event_add_defer.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_defer.xml Auto-merging man/sd_event_add_child.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_child.xml Auto-merging man/sd_bus_wait.xml CONFLICT (add/add): Merge conflict in man/sd_bus_wait.xml Auto-merging man/sd_bus_track_new.xml CONFLICT (add/add): Merge conflict in man/sd_bus_track_new.xml Auto-merging man/sd_bus_track_add_name.xml CONFLICT (add/add): Merge conflict in man/sd_bus_track_add_name.xml Auto-merging man/sd_bus_start.xml CONFLICT (add/add): Merge conflict in man/sd_bus_start.xml Auto-merging man/sd_bus_slot_set_userdata.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_set_userdata.xml Auto-merging man/sd_bus_slot_set_floating.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_set_floating.xml Auto-merging man/sd_bus_slot_set_destroy_callback.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_set_destroy_callback.xml Auto-merging man/sd_bus_slot_set_description.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_set_description.xml Auto-merging man/sd_bus_slot_ref.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_ref.xml Auto-merging man/sd_bus_slot_get_bus.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_get_bus.xml Auto-merging man/sd_bus_set_watch_bind.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_watch_bind.xml Auto-merging man/sd_bus_set_server.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_server.xml Auto-merging man/sd_bus_set_sender.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_sender.xml Auto-merging man/sd_bus_set_property.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_property.xml Auto-merging man/sd_bus_set_method_call_timeout.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_method_call_timeout.xml Auto-merging man/sd_bus_set_exit_on_disconnect.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_exit_on_disconnect.xml Auto-merging man/sd_bus_set_description.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_description.xml Auto-merging man/sd_bus_set_connected_signal.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_connected_signal.xml Auto-merging man/sd_bus_set_close_on_exit.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_close_on_exit.xml Auto-merging man/sd_bus_set_address.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_address.xml Auto-merging man/sd_bus_send.xml CONFLICT (add/add): Merge conflict in man/sd_bus_send.xml Auto-merging man/sd_bus_request_name.xml CONFLICT (add/add): Merge conflict in man/sd_bus_request_name.xml Auto-merging man/sd_bus_reply_method_return.xml CONFLICT (add/add): Merge conflict in man/sd_bus_reply_method_return.xml Auto-merging man/sd_bus_reply_method_error.xml CONFLICT (add/add): Merge conflict in man/sd_bus_reply_method_error.xml Auto-merging man/sd_bus_query_sender_creds.xml CONFLICT (add/add): Merge conflict in man/sd_bus_query_sender_creds.xml Auto-merging man/sd_bus_process.xml CONFLICT (add/add): Merge conflict in man/sd_bus_process.xml Auto-merging man/sd_bus_path_encode.xml CONFLICT (add/add): Merge conflict in man/sd_bus_path_encode.xml Auto-merging man/sd_bus_new.xml CONFLICT (add/add): Merge conflict in man/sd_bus_new.xml Auto-merging man/sd_bus_negotiate_fds.xml CONFLICT (add/add): Merge conflict in man/sd_bus_negotiate_fds.xml Auto-merging man/sd_bus_message_verify_type.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_verify_type.xml Auto-merging man/sd_bus_message_skip.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_skip.xml Auto-merging man/sd_bus_message_set_expect_reply.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_set_expect_reply.xml Auto-merging man/sd_bus_message_set_destination.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_set_destination.xml Auto-merging man/sd_bus_message_sensitive.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_sensitive.xml Auto-merging man/sd_bus_message_seal.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_seal.xml Auto-merging man/sd_bus_message_rewind.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_rewind.xml Auto-merging man/sd_bus_message_read_strv.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_read_strv.xml Auto-merging man/sd_bus_message_read_basic.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_read_basic.xml Auto-merging man/sd_bus_message_read_array.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_read_array.xml Auto-merging man/sd_bus_message_read.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_read.xml Auto-merging man/sd_bus_message_open_container.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_open_container.xml Auto-merging man/sd_bus_message_new_signal.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_new_signal.xml Auto-merging man/sd_bus_message_new_method_error.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_new_method_error.xml Auto-merging man/sd_bus_message_new_method_call.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_new_method_call.xml Auto-merging man/sd_bus_message_new.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_new.xml Auto-merging man/sd_bus_message_get_type.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_get_type.xml Auto-merging man/sd_bus_message_get_signature.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_get_signature.xml Auto-merging man/sd_bus_message_get_monotonic_usec.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_get_monotonic_usec.xml Auto-merging man/sd_bus_message_get_cookie.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_get_cookie.xml Auto-merging man/sd_bus_message_dump.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_dump.xml Auto-merging man/sd_bus_message_copy.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_copy.xml Auto-merging man/sd_bus_message_at_end.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_at_end.xml Auto-merging man/sd_bus_message_append_strv.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append_strv.xml Auto-merging man/sd_bus_message_append_string_memfd.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append_string_memfd.xml Auto-merging man/sd_bus_message_append_basic.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append_basic.xml Auto-merging man/sd_bus_message_append_array.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append_array.xml Auto-merging man/sd_bus_message_append.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append.xml Auto-merging man/sd_bus_list_names.xml CONFLICT (add/add): Merge conflict in man/sd_bus_list_names.xml Auto-merging man/sd_bus_is_open.xml CONFLICT (add/add): Merge conflict in man/sd_bus_is_open.xml Auto-merging man/sd_bus_interface_name_is_valid.xml CONFLICT (add/add): Merge conflict in man/sd_bus_interface_name_is_valid.xml Auto-merging man/sd_bus_get_name_machine_id.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_name_machine_id.xml Auto-merging man/sd_bus_get_name_creds.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_name_creds.xml Auto-merging man/sd_bus_get_n_queued_read.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_n_queued_read.xml Auto-merging man/sd_bus_get_fd.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_fd.xml Auto-merging man/sd_bus_get_current_handler.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_current_handler.xml Auto-merging man/sd_bus_error_add_map.xml CONFLICT (add/add): Merge conflict in man/sd_bus_error_add_map.xml Auto-merging man/sd_bus_error.xml CONFLICT (add/add): Merge conflict in man/sd_bus_error.xml Auto-merging man/sd_bus_enqueue_for_read.xml CONFLICT (add/add): Merge conflict in man/sd_bus_enqueue_for_read.xml Auto-merging man/sd_bus_emit_signal.xml CONFLICT (add/add): Merge conflict in man/sd_bus_emit_signal.xml Auto-merging man/sd_bus_default.xml CONFLICT (add/add): Merge conflict in man/sd_bus_default.xml Auto-merging man/sd_bus_creds_new_from_pid.xml CONFLICT (add/add): Merge conflict in man/sd_bus_creds_new_from_pid.xml Auto-merging man/sd_bus_creds_get_pid.xml CONFLICT (add/add): Merge conflict in man/sd_bus_creds_get_pid.xml Auto-merging man/sd_bus_close.xml CONFLICT (add/add): Merge conflict in man/sd_bus_close.xml Auto-merging man/sd_bus_can_send.xml CONFLICT (add/add): Merge conflict in man/sd_bus_can_send.xml Auto-merging man/sd_bus_call_method.xml CONFLICT (add/add): Merge conflict in man/sd_bus_call_method.xml Auto-merging man/sd_bus_call.xml CONFLICT (add/add): Merge conflict in man/sd_bus_call.xml Auto-merging man/sd_bus_attach_event.xml CONFLICT (add/add): Merge conflict in man/sd_bus_attach_event.xml Auto-merging man/sd_bus_add_object_manager.xml CONFLICT (add/add): Merge conflict in man/sd_bus_add_object_manager.xml Auto-merging man/sd_bus_add_object.xml CONFLICT (add/add): Merge conflict in man/sd_bus_add_object.xml Auto-merging man/sd_bus_add_node_enumerator.xml CONFLICT (add/add): Merge conflict in man/sd_bus_add_node_enumerator.xml Auto-merging man/sd_bus_add_match.xml CONFLICT (add/add): Merge conflict in man/sd_bus_add_match.xml Auto-merging man/sd_booted.xml CONFLICT (add/add): Merge conflict in man/sd_booted.xml Auto-merging man/sd-login.xml CONFLICT (add/add): Merge conflict in man/sd-login.xml Auto-merging man/sd-journal.xml CONFLICT (add/add): Merge conflict in man/sd-journal.xml Auto-merging man/sd-id128.xml CONFLICT (add/add): Merge conflict in man/sd-id128.xml Auto-merging man/sd-hwdb.xml CONFLICT (add/add): Merge conflict in man/sd-hwdb.xml Auto-merging man/sd-event.xml CONFLICT (add/add): Merge conflict in man/sd-event.xml Auto-merging man/sd-daemon.xml CONFLICT (add/add): Merge conflict in man/sd-daemon.xml Auto-merging man/sd-bus.xml CONFLICT (add/add): Merge conflict in man/sd-bus.xml Auto-merging man/sd-bus-errors.xml CONFLICT (add/add): Merge conflict in man/sd-bus-errors.xml Auto-merging man/runlevel.xml CONFLICT (add/add): Merge conflict in man/runlevel.xml Auto-merging man/rules/meson.build CONFLICT (add/add): Merge conflict in man/rules/meson.build Auto-merging man/resolved.conf.xml CONFLICT (add/add): Merge conflict in man/resolved.conf.xml Auto-merging man/resolvectl.xml CONFLICT (add/add): Merge conflict in man/resolvectl.xml Auto-merging man/repart.d.xml CONFLICT (add/add): Merge conflict in man/repart.d.xml Auto-merging man/pstore.conf.xml CONFLICT (add/add): Merge conflict in man/pstore.conf.xml Auto-merging man/portablectl.xml CONFLICT (add/add): Merge conflict in man/portablectl.xml Auto-merging man/pam_systemd_home.xml CONFLICT (add/add): Merge conflict in man/pam_systemd_home.xml Auto-merging man/pam_systemd.xml CONFLICT (add/add): Merge conflict in man/pam_systemd.xml Auto-merging man/os-release.xml CONFLICT (add/add): Merge conflict in man/os-release.xml Auto-merging man/org.freedesktop.timedate1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.timedate1.xml Auto-merging man/org.freedesktop.systemd1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.systemd1.xml Auto-merging man/org.freedesktop.resolve1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.resolve1.xml Auto-merging man/org.freedesktop.machine1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.machine1.xml Auto-merging man/org.freedesktop.login1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.login1.xml Auto-merging man/org.freedesktop.locale1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.locale1.xml Auto-merging man/org.freedesktop.import1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.import1.xml Auto-merging man/org.freedesktop.hostname1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.hostname1.xml Auto-merging man/org.freedesktop.home1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.home1.xml Auto-merging man/org.freedesktop.LogControl1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.LogControl1.xml Auto-merging man/nss-systemd.xml CONFLICT (add/add): Merge conflict in man/nss-systemd.xml Auto-merging man/nss-resolve.xml CONFLICT (add/add): Merge conflict in man/nss-resolve.xml Auto-merging man/nss-mymachines.xml CONFLICT (add/add): Merge conflict in man/nss-mymachines.xml Auto-merging man/nss-myhostname.xml CONFLICT (add/add): Merge conflict in man/nss-myhostname.xml Auto-merging man/networkd.conf.xml CONFLICT (add/add): Merge conflict in man/networkd.conf.xml Auto-merging man/networkctl.xml CONFLICT (add/add): Merge conflict in man/networkctl.xml Auto-merging man/modules-load.d.xml CONFLICT (add/add): Merge conflict in man/modules-load.d.xml Auto-merging man/meson.build CONFLICT (add/add): Merge conflict in man/meson.build Auto-merging man/man.in CONFLICT (add/add): Merge conflict in man/man.in Auto-merging man/machinectl.xml CONFLICT (add/add): Merge conflict in man/machinectl.xml Auto-merging man/machine-info.xml CONFLICT (add/add): Merge conflict in man/machine-info.xml Auto-merging man/machine-id.xml CONFLICT (add/add): Merge conflict in man/machine-id.xml Auto-merging man/logind.conf.xml CONFLICT (add/add): Merge conflict in man/logind.conf.xml Auto-merging man/loginctl.xml CONFLICT (add/add): Merge conflict in man/loginctl.xml Auto-merging man/localtime.xml CONFLICT (add/add): Merge conflict in man/localtime.xml Auto-merging man/localectl.xml CONFLICT (add/add): Merge conflict in man/localectl.xml Auto-merging man/locale.conf.xml CONFLICT (add/add): Merge conflict in man/locale.conf.xml Auto-merging man/loader.conf.xml CONFLICT (add/add): Merge conflict in man/loader.conf.xml Auto-merging man/libudev.xml CONFLICT (add/add): Merge conflict in man/libudev.xml Auto-merging man/libsystemd-pkgconfig.xml CONFLICT (add/add): Merge conflict in man/libsystemd-pkgconfig.xml Auto-merging man/less-variables.xml CONFLICT (add/add): Merge conflict in man/less-variables.xml Auto-merging man/kernel-install.xml CONFLICT (add/add): Merge conflict in man/kernel-install.xml Auto-merging man/kernel-command-line.xml CONFLICT (add/add): Merge conflict in man/kernel-command-line.xml Auto-merging man/journald.conf.xml CONFLICT (add/add): Merge conflict in man/journald.conf.xml Auto-merging man/journalctl.xml CONFLICT (add/add): Merge conflict in man/journalctl.xml Auto-merging man/journal-upload.conf.xml CONFLICT (add/add): Merge conflict in man/journal-upload.conf.xml Auto-merging man/journal-remote.conf.xml CONFLICT (add/add): Merge conflict in man/journal-remote.conf.xml Auto-merging man/hwdb.xml CONFLICT (add/add): Merge conflict in man/hwdb.xml Auto-merging man/html.in CONFLICT (add/add): Merge conflict in man/html.in Auto-merging man/hostnamectl.xml CONFLICT (add/add): Merge conflict in man/hostnamectl.xml Auto-merging man/hostname.xml CONFLICT (add/add): Merge conflict in man/hostname.xml Auto-merging man/homed.conf.xml CONFLICT (add/add): Merge conflict in man/homed.conf.xml Auto-merging man/homectl.xml CONFLICT (add/add): Merge conflict in man/homectl.xml Auto-merging man/halt.xml CONFLICT (add/add): Merge conflict in man/halt.xml Auto-merging man/file-hierarchy.xml CONFLICT (add/add): Merge conflict in man/file-hierarchy.xml Auto-merging man/environment.d.xml CONFLICT (add/add): Merge conflict in man/environment.d.xml Auto-merging man/dnssec-trust-anchors.d.xml CONFLICT (add/add): Merge conflict in man/dnssec-trust-anchors.d.xml Auto-merging man/directives-template.xml CONFLICT (add/add): Merge conflict in man/directives-template.xml Auto-merging man/daemon.xml CONFLICT (add/add): Merge conflict in man/daemon.xml Auto-merging man/custom-man.xsl CONFLICT (add/add): Merge conflict in man/custom-man.xsl Auto-merging man/custom-html.xsl CONFLICT (add/add): Merge conflict in man/custom-html.xsl Auto-merging man/custom-entities.ent.in CONFLICT (add/add): Merge conflict in man/custom-entities.ent.in Auto-merging man/crypttab.xml CONFLICT (add/add): Merge conflict in man/crypttab.xml Auto-merging man/coredumpctl.xml CONFLICT (add/add): Merge conflict in man/coredumpctl.xml Auto-merging man/coredump.conf.xml CONFLICT (add/add): Merge conflict in man/coredump.conf.xml Auto-merging man/busctl.xml CONFLICT (add/add): Merge conflict in man/busctl.xml Auto-merging man/bootup.xml CONFLICT (add/add): Merge conflict in man/bootup.xml Auto-merging man/bootctl.xml CONFLICT (add/add): Merge conflict in man/bootctl.xml Auto-merging man/binfmt.d.xml CONFLICT (add/add): Merge conflict in man/binfmt.d.xml Auto-merging hwdb.d/usb.ids CONFLICT (add/add): Merge conflict in hwdb.d/usb.ids Auto-merging hwdb.d/pnp_id_registry.html CONFLICT (add/add): Merge conflict in hwdb.d/pnp_id_registry.html Auto-merging hwdb.d/pci.ids CONFLICT (add/add): Merge conflict in hwdb.d/pci.ids Auto-merging hwdb.d/parse_hwdb.py CONFLICT (add/add): Merge conflict in hwdb.d/parse_hwdb.py Auto-merging hwdb.d/meson.build CONFLICT (add/add): Merge conflict in hwdb.d/meson.build Auto-merging hwdb.d/ma-small.txt CONFLICT (add/add): Merge conflict in hwdb.d/ma-small.txt Auto-merging hwdb.d/ma-medium.txt CONFLICT (add/add): Merge conflict in hwdb.d/ma-medium.txt Auto-merging hwdb.d/ma-large.txt CONFLICT (add/add): Merge conflict in hwdb.d/ma-large.txt Auto-merging hwdb.d/acpi_id_registry.html CONFLICT (add/add): Merge conflict in hwdb.d/acpi_id_registry.html Auto-merging hwdb.d/70-pointingstick.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/70-pointingstick.hwdb Auto-merging hwdb.d/70-mouse.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/70-mouse.hwdb Auto-merging hwdb.d/60-sensor.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/60-sensor.hwdb Auto-merging hwdb.d/60-keyboard.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/60-keyboard.hwdb Auto-merging hwdb.d/60-input-id.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/60-input-id.hwdb Auto-merging hwdb.d/60-evdev.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/60-evdev.hwdb Auto-merging hwdb.d/20-usb-vendor-model.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-usb-vendor-model.hwdb Auto-merging hwdb.d/20-pci-vendor-model.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-pci-vendor-model.hwdb Auto-merging hwdb.d/20-pci-classes.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-pci-classes.hwdb Auto-merging hwdb.d/20-acpi-vendor.hwdb.patch CONFLICT (add/add): Merge conflict in hwdb.d/20-acpi-vendor.hwdb.patch Auto-merging hwdb.d/20-acpi-vendor.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-acpi-vendor.hwdb Auto-merging hwdb.d/20-OUI.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-OUI.hwdb Auto-merging factory/etc/nsswitch.conf CONFLICT (add/add): Merge conflict in factory/etc/nsswitch.conf Auto-merging docs/var-log/meson.build CONFLICT (add/add): Merge conflict in docs/var-log/meson.build Auto-merging docs/sysvinit/meson.build CONFLICT (add/add): Merge conflict in docs/sysvinit/meson.build Auto-merging docs/USER_RECORD.md CONFLICT (add/add): Merge conflict in docs/USER_RECORD.md Auto-merging docs/USER_NAMES.md CONFLICT (add/add): Merge conflict in docs/USER_NAMES.md Auto-merging docs/USER_GROUP_API.md CONFLICT (add/add): Merge conflict in docs/USER_GROUP_API.md Auto-merging docs/UIDS-GIDS.md CONFLICT (add/add): Merge conflict in docs/UIDS-GIDS.md Auto-merging docs/TRANSIENT-SETTINGS.md CONFLICT (add/add): Merge conflict in docs/TRANSIENT-SETTINGS.md Auto-merging docs/TEMPORARY_DIRECTORIES.md CONFLICT (add/add): Merge conflict in docs/TEMPORARY_DIRECTORIES.md Auto-merging docs/ROOT_STORAGE_DAEMONS.md CONFLICT (add/add): Merge conflict in docs/ROOT_STORAGE_DAEMONS.md Auto-merging docs/RELEASE.md CONFLICT (add/add): Merge conflict in docs/RELEASE.md Auto-merging docs/RANDOM_SEEDS.md CONFLICT (add/add): Merge conflict in docs/RANDOM_SEEDS.md Auto-merging docs/PORTABILITY_AND_STABILITY.md CONFLICT (add/add): Merge conflict in docs/PORTABILITY_AND_STABILITY.md Auto-merging docs/INITRD_INTERFACE.md CONFLICT (add/add): Merge conflict in docs/INITRD_INTERFACE.md Auto-merging docs/HOME_DIRECTORY.md CONFLICT (add/add): Merge conflict in docs/HOME_DIRECTORY.md Auto-merging docs/HACKING.md CONFLICT (add/add): Merge conflict in docs/HACKING.md Auto-merging docs/GROUP_RECORD.md CONFLICT (add/add): Merge conflict in docs/GROUP_RECORD.md Auto-merging docs/ENVIRONMENT.md CONFLICT (add/add): Merge conflict in docs/ENVIRONMENT.md Auto-merging docs/DISCOVERABLE_PARTITIONS.md CONFLICT (add/add): Merge conflict in docs/DISCOVERABLE_PARTITIONS.md Auto-merging docs/DESKTOP_ENVIRONMENTS.md CONFLICT (add/add): Merge conflict in docs/DESKTOP_ENVIRONMENTS.md Auto-merging docs/CONTRIBUTING.md CONFLICT (add/add): Merge conflict in docs/CONTRIBUTING.md Auto-merging docs/CONTAINER_INTERFACE.md CONFLICT (add/add): Merge conflict in docs/CONTAINER_INTERFACE.md Auto-merging docs/CODING_STYLE.md CONFLICT (add/add): Merge conflict in docs/CODING_STYLE.md Auto-merging docs/CGROUP_DELEGATION.md CONFLICT (add/add): Merge conflict in docs/CGROUP_DELEGATION.md Auto-merging docs/BOOT_LOADER_SPECIFICATION.md CONFLICT (add/add): Merge conflict in docs/BOOT_LOADER_SPECIFICATION.md Auto-merging docs/BOOT_LOADER_INTERFACE.md CONFLICT (add/add): Merge conflict in docs/BOOT_LOADER_INTERFACE.md Auto-merging docs/BLOCK_DEVICE_LOCKING.md CONFLICT (add/add): Merge conflict in docs/BLOCK_DEVICE_LOCKING.md Auto-merging docs/AUTOMATIC_BOOT_ASSESSMENT.md CONFLICT (add/add): Merge conflict in docs/AUTOMATIC_BOOT_ASSESSMENT.md Auto-merging coccinelle/xsprintf.cocci CONFLICT (add/add): Merge conflict in coccinelle/xsprintf.cocci Auto-merging coccinelle/synthetic-errno.cocci CONFLICT (add/add): Merge conflict in coccinelle/synthetic-errno.cocci Auto-merging coccinelle/strjoin.cocci CONFLICT (add/add): Merge conflict in coccinelle/strjoin.cocci Auto-merging coccinelle/run-coccinelle.sh CONFLICT (add/add): Merge conflict in coccinelle/run-coccinelle.sh Auto-merging coccinelle/not_in_set.cocci CONFLICT (add/add): Merge conflict in coccinelle/not_in_set.cocci Auto-merging coccinelle/in_set.cocci CONFLICT (add/add): Merge conflict in coccinelle/in_set.cocci Auto-merging coccinelle/flags-set.cocci CONFLICT (add/add): Merge conflict in coccinelle/flags-set.cocci Auto-merging coccinelle/errno.cocci CONFLICT (add/add): Merge conflict in coccinelle/errno.cocci Auto-merging coccinelle/equals-null.cocci CONFLICT (add/add): Merge conflict in coccinelle/equals-null.cocci Auto-merging coccinelle/empty-to-root.cocci CONFLICT (add/add): Merge conflict in coccinelle/empty-to-root.cocci Auto-merging catalog/systemd.zh_TW.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.zh_TW.catalog.in Auto-merging catalog/systemd.zh_CN.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.zh_CN.catalog.in Auto-merging catalog/systemd.sr.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.sr.catalog.in Auto-merging catalog/systemd.ru.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.ru.catalog.in Auto-merging catalog/systemd.pt_BR.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.pt_BR.catalog.in Auto-merging catalog/systemd.pl.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.pl.catalog.in Auto-merging catalog/systemd.ko.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.ko.catalog.in Auto-merging catalog/systemd.it.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.it.catalog.in Auto-merging catalog/systemd.hu.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.hu.catalog.in Auto-merging catalog/systemd.hr.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.hr.catalog.in Auto-merging catalog/systemd.fr.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.fr.catalog.in Auto-merging catalog/systemd.de.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.de.catalog.in Auto-merging catalog/systemd.da.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.da.catalog.in Auto-merging catalog/systemd.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.catalog.in Auto-merging catalog/systemd.bg.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.bg.catalog.in Auto-merging catalog/systemd.be@latin.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.be@latin.catalog.in Auto-merging catalog/systemd.be.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.be.catalog.in Auto-merging catalog/meson.build CONFLICT (add/add): Merge conflict in catalog/meson.build Auto-merging TODO CONFLICT (add/add): Merge conflict in TODO Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging README CONFLICT (add/add): Merge conflict in README Auto-merging NEWS CONFLICT (add/add): Merge conflict in NEWS Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .mkosi/mkosi.ubuntu CONFLICT (add/add): Merge conflict in .mkosi/mkosi.ubuntu Auto-merging .mkosi/mkosi.opensuse CONFLICT (add/add): Merge conflict in .mkosi/mkosi.opensuse Auto-merging .mkosi/mkosi.fedora CONFLICT (add/add): Merge conflict in .mkosi/mkosi.fedora Auto-merging .mkosi/mkosi.debian CONFLICT (add/add): Merge conflict in .mkosi/mkosi.debian Auto-merging .mkosi/mkosi.arch CONFLICT (add/add): Merge conflict in .mkosi/mkosi.arch Auto-merging .mailmap CONFLICT (add/add): Merge conflict in .mailmap Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .github/ISSUE_TEMPLATE/Bug_report.md CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/Bug_report.md Auto-merging .clang-format CONFLICT (add/add): Merge conflict in .clang-format Automatic merge failed; fix conflicts and then commit the result. Traceback (most recent call last): File "/usr/lib/python3/dist-packages/gitbuildrecipe/recipe.py", line 373, in merge_branch child_branch.git_call(*cmd) File "/usr/lib/python3/dist-packages/gitbuildrecipe/recipe.py", line 662, in git_call **kwargs) File "/usr/lib/python3.6/subprocess.py", line 356, in check_output **kwargs).stdout File "/usr/lib/python3.6/subprocess.py", line 438, in run output=stdout, stderr=stderr) subprocess.CalledProcessError: Command '['git', '-C', '/home/buildd/build-RECIPEBRANCHBUILD-2772633/chroot-autobuild/home/buildd/work/tree/recipe', 'merge', '--commit', '--allow-unrelated-histories', '-m', 'Merge applied/ubuntu/devel', '38323fccfae4165f0812e3bf720c26b2dea6f046']' returned non-zero exit status 1. During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/usr/bin/git-build-recipe", line 11, in load_entry_point('git-build-recipe==0.1', 'console_scripts', 'git-build-recipe')() File "/usr/lib/python3/dist-packages/gitbuildrecipe/main.py", line 110, in main build_tree(base_branch, working_directory) File "/usr/lib/python3/dist-packages/gitbuildrecipe/recipe.py", line 489, in build_tree _build_inner_tree(base_branch, target_path) File "/usr/lib/python3/dist-packages/gitbuildrecipe/recipe.py", line 413, in _build_inner_tree instruction.apply(target_path) File "/usr/lib/python3/dist-packages/gitbuildrecipe/recipe.py", line 545, in apply merge_branch(self.recipe_branch, target_path) File "/usr/lib/python3/dist-packages/gitbuildrecipe/recipe.py", line 375, in merge_branch raise MergeFailed(e.output) gitbuildrecipe.recipe.MergeFailed: git merge failed: Auto-merging units/var-lib-machines.mount CONFLICT (add/add): Merge conflict in units/var-lib-machines.mount Auto-merging units/user@.service.in CONFLICT (add/add): Merge conflict in units/user@.service.in Auto-merging units/user/xdg-desktop-autostart.target CONFLICT (add/add): Merge conflict in units/user/xdg-desktop-autostart.target Auto-merging units/user/timers.target CONFLICT (add/add): Merge conflict in units/user/timers.target Auto-merging units/user/systemd-tmpfiles-setup.service CONFLICT (add/add): Merge conflict in units/user/systemd-tmpfiles-setup.service Auto-merging units/user/systemd-tmpfiles-clean.timer CONFLICT (add/add): Merge conflict in units/user/systemd-tmpfiles-clean.timer Auto-merging units/user/systemd-tmpfiles-clean.service CONFLICT (add/add): Merge conflict in units/user/systemd-tmpfiles-clean.service Auto-merging units/user/systemd-exit.service CONFLICT (add/add): Merge conflict in units/user/systemd-exit.service Auto-merging units/user/sound.target CONFLICT (add/add): Merge conflict in units/user/sound.target Auto-merging units/user/sockets.target CONFLICT (add/add): Merge conflict in units/user/sockets.target Auto-merging units/user/smartcard.target CONFLICT (add/add): Merge conflict in units/user/smartcard.target Auto-merging units/user/shutdown.target CONFLICT (add/add): Merge conflict in units/user/shutdown.target Auto-merging units/user/printer.target CONFLICT (add/add): Merge conflict in units/user/printer.target Auto-merging units/user/paths.target CONFLICT (add/add): Merge conflict in units/user/paths.target Auto-merging units/user/meson.build CONFLICT (add/add): Merge conflict in units/user/meson.build Auto-merging units/user/graphical-session.target CONFLICT (add/add): Merge conflict in units/user/graphical-session.target Auto-merging units/user/graphical-session-pre.target CONFLICT (add/add): Merge conflict in units/user/graphical-session-pre.target Auto-merging units/user/exit.target CONFLICT (add/add): Merge conflict in units/user/exit.target Auto-merging units/user/default.target CONFLICT (add/add): Merge conflict in units/user/default.target Auto-merging units/user/bluetooth.target CONFLICT (add/add): Merge conflict in units/user/bluetooth.target Auto-merging units/user/basic.target CONFLICT (add/add): Merge conflict in units/user/basic.target Auto-merging units/user.slice CONFLICT (add/add): Merge conflict in units/user.slice Auto-merging units/user-runtime-dir@.service.in CONFLICT (add/add): Merge conflict in units/user-runtime-dir@.service.in Auto-merging units/user-.slice.d/10-defaults.conf CONFLICT (add/add): Merge conflict in units/user-.slice.d/10-defaults.conf Auto-merging units/usb-gadget.target CONFLICT (add/add): Merge conflict in units/usb-gadget.target Auto-merging units/umount.target CONFLICT (add/add): Merge conflict in units/umount.target Auto-merging units/tmp.mount CONFLICT (add/add): Merge conflict in units/tmp.mount Auto-merging units/timers.target CONFLICT (add/add): Merge conflict in units/timers.target Auto-merging units/time-sync.target CONFLICT (add/add): Merge conflict in units/time-sync.target Auto-merging units/time-set.target CONFLICT (add/add): Merge conflict in units/time-set.target Auto-merging units/systemd-volatile-root.service.in CONFLICT (add/add): Merge conflict in units/systemd-volatile-root.service.in Auto-merging units/systemd-vconsole-setup.service.in CONFLICT (add/add): Merge conflict in units/systemd-vconsole-setup.service.in Auto-merging units/systemd-userdbd.socket CONFLICT (add/add): Merge conflict in units/systemd-userdbd.socket Auto-merging units/systemd-userdbd.service.in CONFLICT (add/add): Merge conflict in units/systemd-userdbd.service.in Auto-merging units/systemd-user-sessions.service.in CONFLICT (add/add): Merge conflict in units/systemd-user-sessions.service.in Auto-merging units/systemd-update-utmp.service.in CONFLICT (add/add): Merge conflict in units/systemd-update-utmp.service.in Auto-merging units/systemd-update-utmp-runlevel.service.in CONFLICT (add/add): Merge conflict in units/systemd-update-utmp-runlevel.service.in Auto-merging units/systemd-update-done.service.in CONFLICT (add/add): Merge conflict in units/systemd-update-done.service.in Auto-merging units/systemd-udevd.service.in CONFLICT (add/add): Merge conflict in units/systemd-udevd.service.in Auto-merging units/systemd-udevd-kernel.socket CONFLICT (add/add): Merge conflict in units/systemd-udevd-kernel.socket Auto-merging units/systemd-udevd-control.socket CONFLICT (add/add): Merge conflict in units/systemd-udevd-control.socket Auto-merging units/systemd-udev-trigger.service CONFLICT (add/add): Merge conflict in units/systemd-udev-trigger.service Auto-merging units/systemd-udev-settle.service CONFLICT (add/add): Merge conflict in units/systemd-udev-settle.service Auto-merging units/systemd-tmpfiles-setup.service CONFLICT (add/add): Merge conflict in units/systemd-tmpfiles-setup.service Auto-merging units/systemd-tmpfiles-setup-dev.service CONFLICT (add/add): Merge conflict in units/systemd-tmpfiles-setup-dev.service Auto-merging units/systemd-tmpfiles-clean.timer CONFLICT (add/add): Merge conflict in units/systemd-tmpfiles-clean.timer Auto-merging units/systemd-tmpfiles-clean.service CONFLICT (add/add): Merge conflict in units/systemd-tmpfiles-clean.service Auto-merging units/systemd-timesyncd.service.in CONFLICT (add/add): Merge conflict in units/systemd-timesyncd.service.in Auto-merging units/systemd-timedated.service.in CONFLICT (add/add): Merge conflict in units/systemd-timedated.service.in Auto-merging units/systemd-time-wait-sync.service.in CONFLICT (add/add): Merge conflict in units/systemd-time-wait-sync.service.in Auto-merging units/systemd-sysusers.service CONFLICT (add/add): Merge conflict in units/systemd-sysusers.service Auto-merging units/systemd-sysctl.service.in CONFLICT (add/add): Merge conflict in units/systemd-sysctl.service.in Auto-merging units/systemd-suspend.service.in CONFLICT (add/add): Merge conflict in units/systemd-suspend.service.in Auto-merging units/systemd-suspend-then-hibernate.service.in CONFLICT (add/add): Merge conflict in units/systemd-suspend-then-hibernate.service.in Auto-merging units/systemd-rfkill.socket CONFLICT (add/add): Merge conflict in units/systemd-rfkill.socket Auto-merging units/systemd-rfkill.service.in CONFLICT (add/add): Merge conflict in units/systemd-rfkill.service.in Auto-merging units/systemd-resolved.service.in CONFLICT (add/add): Merge conflict in units/systemd-resolved.service.in Auto-merging units/systemd-repart.service.in CONFLICT (add/add): Merge conflict in units/systemd-repart.service.in Auto-merging units/systemd-remount-fs.service.in CONFLICT (add/add): Merge conflict in units/systemd-remount-fs.service.in Auto-merging units/systemd-reboot.service CONFLICT (add/add): Merge conflict in units/systemd-reboot.service Auto-merging units/systemd-random-seed.service.in CONFLICT (add/add): Merge conflict in units/systemd-random-seed.service.in Auto-merging units/systemd-quotacheck.service.in CONFLICT (add/add): Merge conflict in units/systemd-quotacheck.service.in Auto-merging units/systemd-pstore.service.in CONFLICT (add/add): Merge conflict in units/systemd-pstore.service.in Auto-merging units/systemd-poweroff.service CONFLICT (add/add): Merge conflict in units/systemd-poweroff.service Auto-merging units/systemd-portabled.service.in CONFLICT (add/add): Merge conflict in units/systemd-portabled.service.in Auto-merging units/systemd-nspawn@.service.in CONFLICT (add/add): Merge conflict in units/systemd-nspawn@.service.in Auto-merging units/systemd-networkd.socket CONFLICT (add/add): Merge conflict in units/systemd-networkd.socket Auto-merging units/systemd-networkd.service.in CONFLICT (add/add): Merge conflict in units/systemd-networkd.service.in Auto-merging units/systemd-networkd-wait-online.service.in CONFLICT (add/add): Merge conflict in units/systemd-networkd-wait-online.service.in Auto-merging units/systemd-network-generator.service.in CONFLICT (add/add): Merge conflict in units/systemd-network-generator.service.in Auto-merging units/systemd-modules-load.service.in CONFLICT (add/add): Merge conflict in units/systemd-modules-load.service.in Auto-merging units/systemd-machined.service.in CONFLICT (add/add): Merge conflict in units/systemd-machined.service.in Auto-merging units/systemd-machine-id-commit.service CONFLICT (add/add): Merge conflict in units/systemd-machine-id-commit.service Auto-merging units/systemd-logind.service.in CONFLICT (add/add): Merge conflict in units/systemd-logind.service.in Auto-merging units/systemd-localed.service.in CONFLICT (add/add): Merge conflict in units/systemd-localed.service.in Auto-merging units/systemd-kexec.service CONFLICT (add/add): Merge conflict in units/systemd-kexec.service Auto-merging units/systemd-journald@.socket CONFLICT (add/add): Merge conflict in units/systemd-journald@.socket Auto-merging units/systemd-journald@.service.in CONFLICT (add/add): Merge conflict in units/systemd-journald@.service.in Auto-merging units/systemd-journald.socket CONFLICT (add/add): Merge conflict in units/systemd-journald.socket Auto-merging units/systemd-journald.service.in CONFLICT (add/add): Merge conflict in units/systemd-journald.service.in Auto-merging units/systemd-journald-varlink@.socket CONFLICT (add/add): Merge conflict in units/systemd-journald-varlink@.socket Auto-merging units/systemd-journald-dev-log.socket CONFLICT (add/add): Merge conflict in units/systemd-journald-dev-log.socket Auto-merging units/systemd-journald-audit.socket CONFLICT (add/add): Merge conflict in units/systemd-journald-audit.socket Auto-merging units/systemd-journal-upload.service.in CONFLICT (add/add): Merge conflict in units/systemd-journal-upload.service.in Auto-merging units/systemd-journal-remote.socket CONFLICT (add/add): Merge conflict in units/systemd-journal-remote.socket Auto-merging units/systemd-journal-remote.service.in CONFLICT (add/add): Merge conflict in units/systemd-journal-remote.service.in Auto-merging units/systemd-journal-gatewayd.socket CONFLICT (add/add): Merge conflict in units/systemd-journal-gatewayd.socket Auto-merging units/systemd-journal-gatewayd.service.in CONFLICT (add/add): Merge conflict in units/systemd-journal-gatewayd.service.in Auto-merging units/systemd-journal-flush.service CONFLICT (add/add): Merge conflict in units/systemd-journal-flush.service Auto-merging units/systemd-journal-catalog-update.service CONFLICT (add/add): Merge conflict in units/systemd-journal-catalog-update.service Auto-merging units/systemd-initctl.socket CONFLICT (add/add): Merge conflict in units/systemd-initctl.socket Auto-merging units/systemd-initctl.service.in CONFLICT (add/add): Merge conflict in units/systemd-initctl.service.in Auto-merging units/systemd-importd.service.in CONFLICT (add/add): Merge conflict in units/systemd-importd.service.in Auto-merging units/systemd-hybrid-sleep.service.in CONFLICT (add/add): Merge conflict in units/systemd-hybrid-sleep.service.in Auto-merging units/systemd-hwdb-update.service.in CONFLICT (add/add): Merge conflict in units/systemd-hwdb-update.service.in Auto-merging units/systemd-hostnamed.service.in CONFLICT (add/add): Merge conflict in units/systemd-hostnamed.service.in Auto-merging units/systemd-homed.service.in CONFLICT (add/add): Merge conflict in units/systemd-homed.service.in Auto-merging units/systemd-hibernate.service.in CONFLICT (add/add): Merge conflict in units/systemd-hibernate.service.in Auto-merging units/systemd-hibernate-resume@.service.in CONFLICT (add/add): Merge conflict in units/systemd-hibernate-resume@.service.in Auto-merging units/systemd-halt.service CONFLICT (add/add): Merge conflict in units/systemd-halt.service Auto-merging units/systemd-fsck@.service.in CONFLICT (add/add): Merge conflict in units/systemd-fsck@.service.in Auto-merging units/systemd-fsck-root.service.in CONFLICT (add/add): Merge conflict in units/systemd-fsck-root.service.in Auto-merging units/systemd-firstboot.service CONFLICT (add/add): Merge conflict in units/systemd-firstboot.service Auto-merging units/systemd-exit.service CONFLICT (add/add): Merge conflict in units/systemd-exit.service Auto-merging units/systemd-coredump@.service.in CONFLICT (add/add): Merge conflict in units/systemd-coredump@.service.in Auto-merging units/systemd-coredump.socket CONFLICT (add/add): Merge conflict in units/systemd-coredump.socket Auto-merging units/systemd-boot-system-token.service CONFLICT (add/add): Merge conflict in units/systemd-boot-system-token.service Auto-merging units/systemd-boot-check-no-failures.service.in CONFLICT (add/add): Merge conflict in units/systemd-boot-check-no-failures.service.in Auto-merging units/systemd-bless-boot.service.in CONFLICT (add/add): Merge conflict in units/systemd-bless-boot.service.in Auto-merging units/systemd-binfmt.service.in CONFLICT (add/add): Merge conflict in units/systemd-binfmt.service.in Auto-merging units/systemd-backlight@.service.in CONFLICT (add/add): Merge conflict in units/systemd-backlight@.service.in Auto-merging units/systemd-ask-password-wall.service CONFLICT (add/add): Merge conflict in units/systemd-ask-password-wall.service Auto-merging units/systemd-ask-password-wall.path CONFLICT (add/add): Merge conflict in units/systemd-ask-password-wall.path Auto-merging units/systemd-ask-password-console.service CONFLICT (add/add): Merge conflict in units/systemd-ask-password-console.service Auto-merging units/systemd-ask-password-console.path CONFLICT (add/add): Merge conflict in units/systemd-ask-password-console.path Auto-merging units/system-update.target CONFLICT (add/add): Merge conflict in units/system-update.target Auto-merging units/system-update-pre.target CONFLICT (add/add): Merge conflict in units/system-update-pre.target Auto-merging units/system-update-cleanup.service CONFLICT (add/add): Merge conflict in units/system-update-cleanup.service Auto-merging units/system-systemd\x2dcryptsetup.slice CONFLICT (add/add): Merge conflict in units/system-systemd\x2dcryptsetup.slice Auto-merging units/syslog.socket CONFLICT (add/add): Merge conflict in units/syslog.socket Auto-merging units/sysinit.target CONFLICT (add/add): Merge conflict in units/sysinit.target Auto-merging units/sys-kernel-tracing.mount CONFLICT (add/add): Merge conflict in units/sys-kernel-tracing.mount Auto-merging units/sys-kernel-debug.mount CONFLICT (add/add): Merge conflict in units/sys-kernel-debug.mount Auto-merging units/sys-kernel-config.mount CONFLICT (add/add): Merge conflict in units/sys-kernel-config.mount Auto-merging units/sys-fs-fuse-connections.mount CONFLICT (add/add): Merge conflict in units/sys-fs-fuse-connections.mount Auto-merging units/swap.target CONFLICT (add/add): Merge conflict in units/swap.target Auto-merging units/suspend.target CONFLICT (add/add): Merge conflict in units/suspend.target Auto-merging units/suspend-then-hibernate.target CONFLICT (add/add): Merge conflict in units/suspend-then-hibernate.target Auto-merging units/sound.target CONFLICT (add/add): Merge conflict in units/sound.target Auto-merging units/sockets.target CONFLICT (add/add): Merge conflict in units/sockets.target Auto-merging units/smartcard.target CONFLICT (add/add): Merge conflict in units/smartcard.target Auto-merging units/slices.target CONFLICT (add/add): Merge conflict in units/slices.target Auto-merging units/sleep.target CONFLICT (add/add): Merge conflict in units/sleep.target Auto-merging units/sigpwr.target CONFLICT (add/add): Merge conflict in units/sigpwr.target Auto-merging units/shutdown.target CONFLICT (add/add): Merge conflict in units/shutdown.target Auto-merging units/serial-getty@.service.m4 CONFLICT (add/add): Merge conflict in units/serial-getty@.service.m4 Auto-merging units/rpcbind.target CONFLICT (add/add): Merge conflict in units/rpcbind.target Auto-merging units/rescue.target CONFLICT (add/add): Merge conflict in units/rescue.target Auto-merging units/rescue.service.in CONFLICT (add/add): Merge conflict in units/rescue.service.in Auto-merging units/remote-fs.target CONFLICT (add/add): Merge conflict in units/remote-fs.target Auto-merging units/remote-fs-pre.target CONFLICT (add/add): Merge conflict in units/remote-fs-pre.target Auto-merging units/remote-cryptsetup.target CONFLICT (add/add): Merge conflict in units/remote-cryptsetup.target Auto-merging units/reboot.target CONFLICT (add/add): Merge conflict in units/reboot.target Auto-merging units/rc-local.service.in CONFLICT (add/add): Merge conflict in units/rc-local.service.in Auto-merging units/quotaon.service.in CONFLICT (add/add): Merge conflict in units/quotaon.service.in Auto-merging units/proc-sys-fs-binfmt_misc.mount CONFLICT (add/add): Merge conflict in units/proc-sys-fs-binfmt_misc.mount Auto-merging units/proc-sys-fs-binfmt_misc.automount CONFLICT (add/add): Merge conflict in units/proc-sys-fs-binfmt_misc.automount Auto-merging units/printer.target CONFLICT (add/add): Merge conflict in units/printer.target Auto-merging units/poweroff.target CONFLICT (add/add): Merge conflict in units/poweroff.target Auto-merging units/paths.target CONFLICT (add/add): Merge conflict in units/paths.target Auto-merging units/nss-user-lookup.target CONFLICT (add/add): Merge conflict in units/nss-user-lookup.target Auto-merging units/nss-lookup.target CONFLICT (add/add): Merge conflict in units/nss-lookup.target Auto-merging units/network.target CONFLICT (add/add): Merge conflict in units/network.target Auto-merging units/network-pre.target CONFLICT (add/add): Merge conflict in units/network-pre.target Auto-merging units/network-online.target CONFLICT (add/add): Merge conflict in units/network-online.target Auto-merging units/multi-user.target CONFLICT (add/add): Merge conflict in units/multi-user.target Auto-merging units/modprobe@.service CONFLICT (add/add): Merge conflict in units/modprobe@.service Auto-merging units/meson.build CONFLICT (add/add): Merge conflict in units/meson.build Auto-merging units/machines.target CONFLICT (add/add): Merge conflict in units/machines.target Auto-merging units/machine.slice CONFLICT (add/add): Merge conflict in units/machine.slice Auto-merging units/local-fs.target CONFLICT (add/add): Merge conflict in units/local-fs.target Auto-merging units/local-fs-pre.target CONFLICT (add/add): Merge conflict in units/local-fs-pre.target Auto-merging units/ldconfig.service CONFLICT (add/add): Merge conflict in units/ldconfig.service Auto-merging units/kmod-static-nodes.service.in CONFLICT (add/add): Merge conflict in units/kmod-static-nodes.service.in Auto-merging units/kexec.target CONFLICT (add/add): Merge conflict in units/kexec.target Auto-merging units/initrd.target CONFLICT (add/add): Merge conflict in units/initrd.target Auto-merging units/initrd-udevadm-cleanup-db.service CONFLICT (add/add): Merge conflict in units/initrd-udevadm-cleanup-db.service Auto-merging units/initrd-switch-root.target CONFLICT (add/add): Merge conflict in units/initrd-switch-root.target Auto-merging units/initrd-switch-root.service CONFLICT (add/add): Merge conflict in units/initrd-switch-root.service Auto-merging units/initrd-root-fs.target CONFLICT (add/add): Merge conflict in units/initrd-root-fs.target Auto-merging units/initrd-root-device.target CONFLICT (add/add): Merge conflict in units/initrd-root-device.target Auto-merging units/initrd-parse-etc.service CONFLICT (add/add): Merge conflict in units/initrd-parse-etc.service Auto-merging units/initrd-fs.target CONFLICT (add/add): Merge conflict in units/initrd-fs.target Auto-merging units/initrd-cleanup.service CONFLICT (add/add): Merge conflict in units/initrd-cleanup.service Auto-merging units/hybrid-sleep.target CONFLICT (add/add): Merge conflict in units/hybrid-sleep.target Auto-merging units/hibernate.target CONFLICT (add/add): Merge conflict in units/hibernate.target Auto-merging units/halt.target CONFLICT (add/add): Merge conflict in units/halt.target Auto-merging units/graphical.target CONFLICT (add/add): Merge conflict in units/graphical.target Auto-merging units/getty@.service.m4 CONFLICT (add/add): Merge conflict in units/getty@.service.m4 Auto-merging units/getty.target CONFLICT (add/add): Merge conflict in units/getty.target Auto-merging units/getty-pre.target CONFLICT (add/add): Merge conflict in units/getty-pre.target Auto-merging units/final.target CONFLICT (add/add): Merge conflict in units/final.target Auto-merging units/exit.target CONFLICT (add/add): Merge conflict in units/exit.target Auto-merging units/emergency.target CONFLICT (add/add): Merge conflict in units/emergency.target Auto-merging units/emergency.service.in CONFLICT (add/add): Merge conflict in units/emergency.service.in Auto-merging units/dev-mqueue.mount CONFLICT (add/add): Merge conflict in units/dev-mqueue.mount Auto-merging units/dev-hugepages.mount CONFLICT (add/add): Merge conflict in units/dev-hugepages.mount Auto-merging units/debug-shell.service.in CONFLICT (add/add): Merge conflict in units/debug-shell.service.in Auto-merging units/cryptsetup.target CONFLICT (add/add): Merge conflict in units/cryptsetup.target Auto-merging units/cryptsetup-pre.target CONFLICT (add/add): Merge conflict in units/cryptsetup-pre.target Auto-merging units/container-getty@.service.m4 CONFLICT (add/add): Merge conflict in units/container-getty@.service.m4 Auto-merging units/console-getty.service.m4 CONFLICT (add/add): Merge conflict in units/console-getty.service.m4 Auto-merging units/boot-complete.target CONFLICT (add/add): Merge conflict in units/boot-complete.target Auto-merging units/bluetooth.target CONFLICT (add/add): Merge conflict in units/bluetooth.target Auto-merging units/blockdev@.target CONFLICT (add/add): Merge conflict in units/blockdev@.target Auto-merging units/basic.target CONFLICT (add/add): Merge conflict in units/basic.target Auto-merging travis-ci/managers/fuzzbuzz.sh CONFLICT (add/add): Merge conflict in travis-ci/managers/fuzzbuzz.sh Auto-merging travis-ci/managers/fedora.sh CONFLICT (add/add): Merge conflict in travis-ci/managers/fedora.sh Auto-merging travis-ci/managers/debian.sh CONFLICT (add/add): Merge conflict in travis-ci/managers/debian.sh Auto-merging tools/xml_helper.py CONFLICT (add/add): Merge conflict in tools/xml_helper.py Auto-merging tools/update-man-rules.py CONFLICT (add/add): Merge conflict in tools/update-man-rules.py Auto-merging tools/update-dbus-docs.py CONFLICT (add/add): Merge conflict in tools/update-dbus-docs.py Auto-merging tools/oss-fuzz.sh CONFLICT (add/add): Merge conflict in tools/oss-fuzz.sh Auto-merging tools/make-man-index.py CONFLICT (add/add): Merge conflict in tools/make-man-index.py Auto-merging tools/make-directive-index.py CONFLICT (add/add): Merge conflict in tools/make-directive-index.py Auto-merging tools/make-autosuspend-rules.py CONFLICT (add/add): Merge conflict in tools/make-autosuspend-rules.py Auto-merging tools/git-contrib.sh CONFLICT (add/add): Merge conflict in tools/git-contrib.sh Auto-merging tools/generate-gperfs.py CONFLICT (add/add): Merge conflict in tools/generate-gperfs.py Auto-merging tools/gdb-sd_dump_hashmaps.py CONFLICT (add/add): Merge conflict in tools/gdb-sd_dump_hashmaps.py Auto-merging tools/find-tabs.sh CONFLICT (add/add): Merge conflict in tools/find-tabs.sh Auto-merging tools/find-double-newline.sh CONFLICT (add/add): Merge conflict in tools/find-double-newline.sh Auto-merging tools/chromiumos/gen_autosuspend_rules.py CONFLICT (add/add): Merge conflict in tools/chromiumos/gen_autosuspend_rules.py Auto-merging tmpfiles.d/tmp.conf CONFLICT (add/add): Merge conflict in tmpfiles.d/tmp.conf Auto-merging tmpfiles.d/systemd-pstore.conf CONFLICT (add/add): Merge conflict in tmpfiles.d/systemd-pstore.conf Auto-merging tmpfiles.d/portables.conf CONFLICT (add/add): Merge conflict in tmpfiles.d/portables.conf Auto-merging tmpfiles.d/meson.build CONFLICT (add/add): Merge conflict in tmpfiles.d/meson.build Auto-merging tmpfiles.d/legacy.conf CONFLICT (add/add): Merge conflict in tmpfiles.d/legacy.conf Auto-merging test/units/timers.target CONFLICT (add/add): Merge conflict in test/units/timers.target Auto-merging test/units/testsuite-48.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-48.sh Auto-merging test/units/testsuite-47.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-47.sh Auto-merging test/units/testsuite-38.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-38.sh Auto-merging test/units/testsuite-36.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-36.sh Auto-merging test/units/testsuite-29.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-29.sh Auto-merging test/units/testsuite-24.service CONFLICT (add/add): Merge conflict in test/units/testsuite-24.service Auto-merging test/units/testsuite-16.service CONFLICT (add/add): Merge conflict in test/units/testsuite-16.service Auto-merging test/units/testsuite-13.sh CONFLICT (add/add): Merge conflict in test/units/testsuite-13.sh Auto-merging test/units/testsuite-02.service CONFLICT (add/add): Merge conflict in test/units/testsuite-02.service Auto-merging test/units/sysinit.target CONFLICT (add/add): Merge conflict in test/units/sysinit.target Auto-merging test/units/sockets.target CONFLICT (add/add): Merge conflict in test/units/sockets.target Auto-merging test/units/shutdown.target CONFLICT (add/add): Merge conflict in test/units/shutdown.target Auto-merging test/units/basic.target CONFLICT (add/add): Merge conflict in test/units/basic.target Auto-merging test/udev-test.pl CONFLICT (add/add): Merge conflict in test/udev-test.pl Auto-merging test/testsuite-11.units/fail-on-restart.service CONFLICT (add/add): Merge conflict in test/testsuite-11.units/fail-on-restart.service Auto-merging test/testsuite-04.units/forever-print-hola.service CONFLICT (add/add): Merge conflict in test/testsuite-04.units/forever-print-hola.service Auto-merging test/test-path/sysinit.target CONFLICT (add/add): Merge conflict in test/test-path/sysinit.target Auto-merging test/test-path/paths.target CONFLICT (add/add): Merge conflict in test/test-path/paths.target Auto-merging test/test-path/path-mycustomunit.service CONFLICT (add/add): Merge conflict in test/test-path/path-mycustomunit.service Auto-merging test/test-path/path-modified.service CONFLICT (add/add): Merge conflict in test/test-path/path-modified.service Auto-merging test/test-path/path-makedirectory.service CONFLICT (add/add): Merge conflict in test/test-path/path-makedirectory.service Auto-merging test/test-path/path-existsglob.service CONFLICT (add/add): Merge conflict in test/test-path/path-existsglob.service Auto-merging test/test-path/path-exists.service CONFLICT (add/add): Merge conflict in test/test-path/path-exists.service Auto-merging test/test-path/path-directorynotempty.service CONFLICT (add/add): Merge conflict in test/test-path/path-directorynotempty.service Auto-merging test/test-path/path-changed.service CONFLICT (add/add): Merge conflict in test/test-path/path-changed.service Auto-merging test/test-path/basic.target CONFLICT (add/add): Merge conflict in test/test-path/basic.target Auto-merging test/test-network/systemd-networkd-tests.py CONFLICT (add/add): Merge conflict in test/test-network/systemd-networkd-tests.py Auto-merging test/test-network/conf/vti6.network CONFLICT (add/add): Merge conflict in test/test-network/conf/vti6.network Auto-merging test/test-network/conf/vti.network CONFLICT (add/add): Merge conflict in test/test-network/conf/vti.network Auto-merging test/test-network/conf/state-file-tests.network CONFLICT (add/add): Merge conflict in test/test-network/conf/state-file-tests.network Auto-merging test/test-network/conf/sit.network CONFLICT (add/add): Merge conflict in test/test-network/conf/sit.network Auto-merging test/test-network/conf/routing-policy-rule-test1.network CONFLICT (add/add): Merge conflict in test/test-network/conf/routing-policy-rule-test1.network Auto-merging test/test-network/conf/routing-policy-rule-dummy98.network CONFLICT (add/add): Merge conflict in test/test-network/conf/routing-policy-rule-dummy98.network Auto-merging test/test-network/conf/netdev-link-local-addressing-yes.network CONFLICT (add/add): Merge conflict in test/test-network/conf/netdev-link-local-addressing-yes.network Auto-merging test/test-network/conf/macvtap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/macvtap.network Auto-merging test/test-network/conf/macvlan.network CONFLICT (add/add): Merge conflict in test/test-network/conf/macvlan.network Auto-merging test/test-network/conf/isatap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/isatap.network Auto-merging test/test-network/conf/ipvtap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipvtap.network Auto-merging test/test-network/conf/ipvlan.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipvlan.network Auto-merging test/test-network/conf/ipv6ra-prefix.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipv6ra-prefix.network Auto-merging test/test-network/conf/ipv6-prefix.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipv6-prefix.network Auto-merging test/test-network/conf/ipv6-prefix-veth.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipv6-prefix-veth.network Auto-merging test/test-network/conf/ipv6-prefix-veth-token-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipv6-prefix-veth-token-static.network Auto-merging test/test-network/conf/ipip.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ipip.network Auto-merging test/test-network/conf/ip6tnl.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ip6tnl.network Auto-merging test/test-network/conf/ip6gretun.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ip6gretun.network Auto-merging test/test-network/conf/ip6gretap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/ip6gretap.network Auto-merging test/test-network/conf/gretun.network CONFLICT (add/add): Merge conflict in test/test-network/conf/gretun.network Auto-merging test/test-network/conf/gretap.network CONFLICT (add/add): Merge conflict in test/test-network/conf/gretap.network Auto-merging test/test-network/conf/erspan.network CONFLICT (add/add): Merge conflict in test/test-network/conf/erspan.network Auto-merging test/test-network/conf/dhcp-client-gateway-ipv6.network CONFLICT (add/add): Merge conflict in test/test-network/conf/dhcp-client-gateway-ipv6.network Auto-merging test/test-network/conf/dhcp-client-gateway-ipv4.network CONFLICT (add/add): Merge conflict in test/test-network/conf/dhcp-client-gateway-ipv4.network Auto-merging test/test-network/conf/6rd.network CONFLICT (add/add): Merge conflict in test/test-network/conf/6rd.network Auto-merging test/test-network/conf/25-vrf.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-vrf.network Auto-merging test/test-network/conf/25-sysctl.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-sysctl.network Auto-merging test/test-network/conf/25-route-vrf.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-route-vrf.network Auto-merging test/test-network/conf/25-route-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-route-static.network Auto-merging test/test-network/conf/25-qdisc-qfq.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-qdisc-qfq.network Auto-merging test/test-network/conf/25-qdisc-drr.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-qdisc-drr.network Auto-merging test/test-network/conf/25-qdisc-clsact-and-htb.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-qdisc-clsact-and-htb.network Auto-merging test/test-network/conf/25-qdisc-cake.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-qdisc-cake.network Auto-merging test/test-network/conf/25-ipv6-address-label-section.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-ipv6-address-label-section.network Auto-merging test/test-network/conf/25-gateway-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-gateway-static.network Auto-merging test/test-network/conf/25-gateway-next-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-gateway-next-static.network Auto-merging test/test-network/conf/25-fibrule-uidrange.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-fibrule-uidrange.network Auto-merging test/test-network/conf/25-fibrule-port-range.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-fibrule-port-range.network Auto-merging test/test-network/conf/25-fibrule-invert.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-fibrule-invert.network Auto-merging test/test-network/conf/25-address-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-address-static.network Auto-merging test/test-network/conf/25-address-preferred-lifetime-zero.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-address-preferred-lifetime-zero.network Auto-merging test/test-network/conf/25-address-link-section.network CONFLICT (add/add): Merge conflict in test/test-network/conf/25-address-link-section.network Auto-merging test/test-network/conf/24-search-domain.network CONFLICT (add/add): Merge conflict in test/test-network/conf/24-search-domain.network Auto-merging test/test-network/conf/24-lldp.network CONFLICT (add/add): Merge conflict in test/test-network/conf/24-lldp.network Auto-merging test/test-network/conf/24-keep-configuration-static.network CONFLICT (add/add): Merge conflict in test/test-network/conf/24-keep-configuration-static.network Auto-merging test/test-network/conf/23-emit-lldp.network CONFLICT (add/add): Merge conflict in test/test-network/conf/23-emit-lldp.network Auto-merging test/test-network/conf/23-bond199.network CONFLICT (add/add): Merge conflict in test/test-network/conf/23-bond199.network Auto-merging test/test-network-generator-conversion.sh CONFLICT (add/add): Merge conflict in test/test-network-generator-conversion.sh Auto-merging test/test-functions CONFLICT (add/add): Merge conflict in test/test-functions Auto-merging test/test-execute/exec-dynamicuser-statedir.service CONFLICT (add/add): Merge conflict in test/test-execute/exec-dynamicuser-statedir.service Auto-merging test/test-exec-deserialization.py CONFLICT (add/add): Merge conflict in test/test-exec-deserialization.py Auto-merging test/sysv-generator-test.py CONFLICT (add/add): Merge conflict in test/sysv-generator-test.py Auto-merging test/sys-script.py CONFLICT (add/add): Merge conflict in test/sys-script.py Auto-merging test/run-integration-tests.sh CONFLICT (add/add): Merge conflict in test/run-integration-tests.sh Auto-merging test/rule-syntax-check.py CONFLICT (add/add): Merge conflict in test/rule-syntax-check.py Auto-merging test/networkd-test.py CONFLICT (add/add): Merge conflict in test/networkd-test.py Auto-merging test/mkosi.default.networkd-test CONFLICT (add/add): Merge conflict in test/mkosi.default.networkd-test Auto-merging test/meson.build CONFLICT (add/add): Merge conflict in test/meson.build Auto-merging test/hwdb-test.sh CONFLICT (add/add): Merge conflict in test/hwdb-test.sh Auto-merging test/fuzz/meson.build CONFLICT (add/add): Merge conflict in test/fuzz/meson.build Auto-merging test/fuzz/fuzz-unit-file/var-lib-machines.mount CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/var-lib-machines.mount Auto-merging test/fuzz/fuzz-unit-file/timers.target CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/timers.target Auto-merging test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer Auto-merging test/fuzz/fuzz-unit-file/systemd-resolved.service CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/systemd-resolved.service Auto-merging test/fuzz/fuzz-unit-file/systemd-machined.service CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/systemd-machined.service Auto-merging test/fuzz/fuzz-unit-file/systemd-ask-password-console.path CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/systemd-ask-password-console.path Auto-merging test/fuzz/fuzz-unit-file/syslog.socket CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/syslog.socket Auto-merging test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount Auto-merging test/fuzz/fuzz-unit-file/machine.slice CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/machine.slice Auto-merging test/fuzz/fuzz-unit-file/directives.service CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-unit-file/directives.service Auto-merging test/fuzz/fuzz-udev-rules/99-systemd.rules CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-udev-rules/99-systemd.rules Auto-merging test/fuzz/fuzz-network-parser/oss-fuzz-15678 CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-network-parser/oss-fuzz-15678 Auto-merging test/fuzz/fuzz-network-parser/directives.network CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-network-parser/directives.network Auto-merging test/fuzz/fuzz-netdev-parser/directives.netdev CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-netdev-parser/directives.netdev Auto-merging test/fuzz/fuzz-link-parser/99-default.link CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-link-parser/99-default.link Auto-merging test/fuzz/fuzz-catalog/systemd.pl.catalog CONFLICT (add/add): Merge conflict in test/fuzz/fuzz-catalog/systemd.pl.catalog Auto-merging test/create-sys-script.py CONFLICT (add/add): Merge conflict in test/create-sys-script.py Auto-merging test/create-busybox-container CONFLICT (add/add): Merge conflict in test/create-busybox-container Auto-merging test/TEST-36-NUMAPOLICY/test.sh CONFLICT (add/add): Merge conflict in test/TEST-36-NUMAPOLICY/test.sh Auto-merging test/TEST-29-UDEV-ID_RENAMING/test.sh CONFLICT (add/add): Merge conflict in test/TEST-29-UDEV-ID_RENAMING/test.sh Auto-merging test/TEST-13-NSPAWN-SMOKE/test.sh CONFLICT (add/add): Merge conflict in test/TEST-13-NSPAWN-SMOKE/test.sh Auto-merging test/README.testsuite CONFLICT (add/add): Merge conflict in test/README.testsuite Auto-merging sysusers.d/systemd.conf.m4 CONFLICT (add/add): Merge conflict in sysusers.d/systemd.conf.m4 Auto-merging sysusers.d/meson.build CONFLICT (add/add): Merge conflict in sysusers.d/meson.build Auto-merging sysctl.d/meson.build CONFLICT (add/add): Merge conflict in sysctl.d/meson.build Auto-merging sysctl.d/50-default.conf CONFLICT (add/add): Merge conflict in sysctl.d/50-default.conf Auto-merging sysctl.d/50-coredump.conf.in CONFLICT (add/add): Merge conflict in sysctl.d/50-coredump.conf.in Auto-merging src/xdg-autostart-generator/xdg-autostart-service.h CONFLICT (add/add): Merge conflict in src/xdg-autostart-generator/xdg-autostart-service.h Auto-merging src/xdg-autostart-generator/xdg-autostart-service.c CONFLICT (add/add): Merge conflict in src/xdg-autostart-generator/xdg-autostart-service.c Auto-merging src/xdg-autostart-generator/xdg-autostart-generator.c CONFLICT (add/add): Merge conflict in src/xdg-autostart-generator/xdg-autostart-generator.c Auto-merging src/xdg-autostart-generator/xdg-autostart-condition.c CONFLICT (add/add): Merge conflict in src/xdg-autostart-generator/xdg-autostart-condition.c Auto-merging src/volatile-root/volatile-root.c CONFLICT (add/add): Merge conflict in src/volatile-root/volatile-root.c Auto-merging src/veritysetup/veritysetup.c CONFLICT (add/add): Merge conflict in src/veritysetup/veritysetup.c Auto-merging src/veritysetup/veritysetup-generator.c CONFLICT (add/add): Merge conflict in src/veritysetup/veritysetup-generator.c Auto-merging src/vconsole/vconsole-setup.c CONFLICT (add/add): Merge conflict in src/vconsole/vconsole-setup.c Auto-merging src/vconsole/meson.build CONFLICT (add/add): Merge conflict in src/vconsole/meson.build Auto-merging src/vconsole/90-vconsole.rules.in CONFLICT (add/add): Merge conflict in src/vconsole/90-vconsole.rules.in Auto-merging src/userdb/userwork.c CONFLICT (add/add): Merge conflict in src/userdb/userwork.c Auto-merging src/userdb/userdbd.c CONFLICT (add/add): Merge conflict in src/userdb/userdbd.c Auto-merging src/userdb/userdbd-manager.h CONFLICT (add/add): Merge conflict in src/userdb/userdbd-manager.h Auto-merging src/userdb/userdbd-manager.c CONFLICT (add/add): Merge conflict in src/userdb/userdbd-manager.c Auto-merging src/userdb/userdbctl.c CONFLICT (add/add): Merge conflict in src/userdb/userdbctl.c Auto-merging src/userdb/meson.build CONFLICT (add/add): Merge conflict in src/userdb/meson.build Auto-merging src/user-sessions/user-sessions.c CONFLICT (add/add): Merge conflict in src/user-sessions/user-sessions.c Auto-merging src/update-utmp/update-utmp.c CONFLICT (add/add): Merge conflict in src/update-utmp/update-utmp.c Auto-merging src/update-done/update-done.c CONFLICT (add/add): Merge conflict in src/update-done/update-done.c Auto-merging src/udev/v4l_id/v4l_id.c CONFLICT (add/add): Merge conflict in src/udev/v4l_id/v4l_id.c Auto-merging src/udev/udevd.h CONFLICT (add/add): Merge conflict in src/udev/udevd.h Auto-merging src/udev/udevd.c CONFLICT (add/add): Merge conflict in src/udev/udevd.c Auto-merging src/udev/udevadm.h CONFLICT (add/add): Merge conflict in src/udev/udevadm.h Auto-merging src/udev/udevadm.c CONFLICT (add/add): Merge conflict in src/udev/udevadm.c Auto-merging src/udev/udevadm-util.h CONFLICT (add/add): Merge conflict in src/udev/udevadm-util.h Auto-merging src/udev/udevadm-util.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-util.c Auto-merging src/udev/udevadm-trigger.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-trigger.c Auto-merging src/udev/udevadm-test.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-test.c Auto-merging src/udev/udevadm-test-builtin.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-test-builtin.c Auto-merging src/udev/udevadm-settle.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-settle.c Auto-merging src/udev/udevadm-monitor.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-monitor.c Auto-merging src/udev/udevadm-info.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-info.c Auto-merging src/udev/udevadm-hwdb.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-hwdb.c Auto-merging src/udev/udevadm-control.c CONFLICT (add/add): Merge conflict in src/udev/udevadm-control.c Auto-merging src/udev/udev.conf CONFLICT (add/add): Merge conflict in src/udev/udev.conf Auto-merging src/udev/udev-watch.h CONFLICT (add/add): Merge conflict in src/udev/udev-watch.h Auto-merging src/udev/udev-watch.c CONFLICT (add/add): Merge conflict in src/udev/udev-watch.c Auto-merging src/udev/udev-rules.h CONFLICT (add/add): Merge conflict in src/udev/udev-rules.h Auto-merging src/udev/udev-rules.c CONFLICT (add/add): Merge conflict in src/udev/udev-rules.c Auto-merging src/udev/udev-node.h CONFLICT (add/add): Merge conflict in src/udev/udev-node.h Auto-merging src/udev/udev-node.c CONFLICT (add/add): Merge conflict in src/udev/udev-node.c Auto-merging src/udev/udev-event.h CONFLICT (add/add): Merge conflict in src/udev/udev-event.h Auto-merging src/udev/udev-event.c CONFLICT (add/add): Merge conflict in src/udev/udev-event.c Auto-merging src/udev/udev-ctrl.h CONFLICT (add/add): Merge conflict in src/udev/udev-ctrl.h Auto-merging src/udev/udev-ctrl.c CONFLICT (add/add): Merge conflict in src/udev/udev-ctrl.c Auto-merging src/udev/udev-builtin.h CONFLICT (add/add): Merge conflict in src/udev/udev-builtin.h Auto-merging src/udev/udev-builtin.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin.c Auto-merging src/udev/udev-builtin-usb_id.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-usb_id.c Auto-merging src/udev/udev-builtin-uaccess.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-uaccess.c Auto-merging src/udev/udev-builtin-path_id.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-path_id.c Auto-merging src/udev/udev-builtin-net_setup_link.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-net_setup_link.c Auto-merging src/udev/udev-builtin-net_id.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-net_id.c Auto-merging src/udev/udev-builtin-kmod.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-kmod.c Auto-merging src/udev/udev-builtin-keyboard.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-keyboard.c Auto-merging src/udev/udev-builtin-input_id.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-input_id.c Auto-merging src/udev/udev-builtin-hwdb.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-hwdb.c Auto-merging src/udev/udev-builtin-btrfs.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-btrfs.c Auto-merging src/udev/udev-builtin-blkid.c CONFLICT (add/add): Merge conflict in src/udev/udev-builtin-blkid.c Auto-merging src/udev/scsi_id/scsi_serial.c CONFLICT (add/add): Merge conflict in src/udev/scsi_id/scsi_serial.c Auto-merging src/udev/scsi_id/scsi_id.h CONFLICT (add/add): Merge conflict in src/udev/scsi_id/scsi_id.h Auto-merging src/udev/scsi_id/scsi_id.c CONFLICT (add/add): Merge conflict in src/udev/scsi_id/scsi_id.c Auto-merging src/udev/scsi_id/scsi.h CONFLICT (add/add): Merge conflict in src/udev/scsi_id/scsi.h Auto-merging src/udev/net/link-config.h CONFLICT (add/add): Merge conflict in src/udev/net/link-config.h Auto-merging src/udev/net/link-config.c CONFLICT (add/add): Merge conflict in src/udev/net/link-config.c Auto-merging src/udev/net/link-config-gperf.gperf CONFLICT (add/add): Merge conflict in src/udev/net/link-config-gperf.gperf Auto-merging src/udev/net/fuzz-link-parser.c CONFLICT (add/add): Merge conflict in src/udev/net/fuzz-link-parser.c Auto-merging src/udev/mtd_probe/probe_smartmedia.c CONFLICT (add/add): Merge conflict in src/udev/mtd_probe/probe_smartmedia.c Auto-merging src/udev/mtd_probe/mtd_probe.h CONFLICT (add/add): Merge conflict in src/udev/mtd_probe/mtd_probe.h Auto-merging src/udev/mtd_probe/mtd_probe.c CONFLICT (add/add): Merge conflict in src/udev/mtd_probe/mtd_probe.c Auto-merging src/udev/meson.build CONFLICT (add/add): Merge conflict in src/udev/meson.build Auto-merging src/udev/fido_id/test-fido-id-desc.c CONFLICT (add/add): Merge conflict in src/udev/fido_id/test-fido-id-desc.c Auto-merging src/udev/fido_id/fuzz-fido-id-desc.c CONFLICT (add/add): Merge conflict in src/udev/fido_id/fuzz-fido-id-desc.c Auto-merging src/udev/fido_id/fido_id_desc.h CONFLICT (add/add): Merge conflict in src/udev/fido_id/fido_id_desc.h Auto-merging src/udev/fido_id/fido_id_desc.c CONFLICT (add/add): Merge conflict in src/udev/fido_id/fido_id_desc.c Auto-merging src/udev/fido_id/fido_id.c CONFLICT (add/add): Merge conflict in src/udev/fido_id/fido_id.c Auto-merging src/udev/cdrom_id/cdrom_id.c CONFLICT (add/add): Merge conflict in src/udev/cdrom_id/cdrom_id.c Auto-merging src/udev/ata_id/ata_id.c CONFLICT (add/add): Merge conflict in src/udev/ata_id/ata_id.c Auto-merging src/tty-ask-password-agent/tty-ask-password-agent.c CONFLICT (add/add): Merge conflict in src/tty-ask-password-agent/tty-ask-password-agent.c Auto-merging src/tmpfiles/tmpfiles.c CONFLICT (add/add): Merge conflict in src/tmpfiles/tmpfiles.c Auto-merging src/timesync/timesyncd.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd.c Auto-merging src/timesync/timesyncd-server.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-server.h Auto-merging src/timesync/timesyncd-server.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-server.c Auto-merging src/timesync/timesyncd-ntp-message.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-ntp-message.h Auto-merging src/timesync/timesyncd-manager.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-manager.h Auto-merging src/timesync/timesyncd-manager.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-manager.c Auto-merging src/timesync/timesyncd-conf.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-conf.h Auto-merging src/timesync/timesyncd-conf.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-conf.c Auto-merging src/timesync/timesyncd-bus.h CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-bus.h Auto-merging src/timesync/timesyncd-bus.c CONFLICT (add/add): Merge conflict in src/timesync/timesyncd-bus.c Auto-merging src/timesync/test-timesync.c CONFLICT (add/add): Merge conflict in src/timesync/test-timesync.c Auto-merging src/timesync/org.freedesktop.timesync1.service CONFLICT (add/add): Merge conflict in src/timesync/org.freedesktop.timesync1.service Auto-merging src/timesync/meson.build CONFLICT (add/add): Merge conflict in src/timesync/meson.build Auto-merging src/timedate/timedated.c CONFLICT (add/add): Merge conflict in src/timedate/timedated.c Auto-merging src/timedate/timedatectl.c CONFLICT (add/add): Merge conflict in src/timedate/timedatectl.c Auto-merging src/timedate/org.freedesktop.timedate1.service CONFLICT (add/add): Merge conflict in src/timedate/org.freedesktop.timedate1.service Auto-merging src/timedate/org.freedesktop.timedate1.policy CONFLICT (add/add): Merge conflict in src/timedate/org.freedesktop.timedate1.policy Auto-merging src/timedate/org.freedesktop.timedate1.conf CONFLICT (add/add): Merge conflict in src/timedate/org.freedesktop.timedate1.conf Auto-merging src/timedate/meson.build CONFLICT (add/add): Merge conflict in src/timedate/meson.build Auto-merging src/time-wait-sync/time-wait-sync.c CONFLICT (add/add): Merge conflict in src/time-wait-sync/time-wait-sync.c Auto-merging src/test/test-xml.c CONFLICT (add/add): Merge conflict in src/test/test-xml.c Auto-merging src/test/test-xdg-autostart.c CONFLICT (add/add): Merge conflict in src/test/test-xdg-autostart.c Auto-merging src/test/test-xattr-util.c CONFLICT (add/add): Merge conflict in src/test/test-xattr-util.c Auto-merging src/test/test-web-util.c CONFLICT (add/add): Merge conflict in src/test/test-web-util.c Auto-merging src/test/test-watchdog.c CONFLICT (add/add): Merge conflict in src/test/test-watchdog.c Auto-merging src/test/test-watch-pid.c CONFLICT (add/add): Merge conflict in src/test/test-watch-pid.c Auto-merging src/test/test-verbs.c CONFLICT (add/add): Merge conflict in src/test/test-verbs.c Auto-merging src/test/test-varlink.c CONFLICT (add/add): Merge conflict in src/test/test-varlink.c Auto-merging src/test/test-util.c CONFLICT (add/add): Merge conflict in src/test/test-util.c Auto-merging src/test/test-utf8.c CONFLICT (add/add): Merge conflict in src/test/test-utf8.c Auto-merging src/test/test-user-util.c CONFLICT (add/add): Merge conflict in src/test/test-user-util.c Auto-merging src/test/test-unit-name.c CONFLICT (add/add): Merge conflict in src/test/test-unit-name.c Auto-merging src/test/test-unit-file.c CONFLICT (add/add): Merge conflict in src/test/test-unit-file.c Auto-merging src/test/test-unaligned.c CONFLICT (add/add): Merge conflict in src/test/test-unaligned.c Auto-merging src/test/test-umount.c CONFLICT (add/add): Merge conflict in src/test/test-umount.c Auto-merging src/test/test-umask-util.c CONFLICT (add/add): Merge conflict in src/test/test-umask-util.c Auto-merging src/test/test-uid-range.c CONFLICT (add/add): Merge conflict in src/test/test-uid-range.c Auto-merging src/test/test-udev.c CONFLICT (add/add): Merge conflict in src/test/test-udev.c Auto-merging src/test/test-tmpfiles.c CONFLICT (add/add): Merge conflict in src/test/test-tmpfiles.c Auto-merging src/test/test-time-util.c CONFLICT (add/add): Merge conflict in src/test/test-time-util.c Auto-merging src/test/test-terminal-util.c CONFLICT (add/add): Merge conflict in src/test/test-terminal-util.c Auto-merging src/test/test-tables.c CONFLICT (add/add): Merge conflict in src/test/test-tables.c Auto-merging src/test/test-systemd-tmpfiles.py CONFLICT (add/add): Merge conflict in src/test/test-systemd-tmpfiles.py Auto-merging src/test/test-sysctl-util.c CONFLICT (add/add): Merge conflict in src/test/test-sysctl-util.c Auto-merging src/test/test-strxcpyx.c CONFLICT (add/add): Merge conflict in src/test/test-strxcpyx.c Auto-merging src/test/test-strv.c CONFLICT (add/add): Merge conflict in src/test/test-strv.c Auto-merging src/test/test-strip-tab-ansi.c CONFLICT (add/add): Merge conflict in src/test/test-strip-tab-ansi.c Auto-merging src/test/test-string-util.c CONFLICT (add/add): Merge conflict in src/test/test-string-util.c Auto-merging src/test/test-strbuf.c CONFLICT (add/add): Merge conflict in src/test/test-strbuf.c Auto-merging src/test/test-static-destruct.c CONFLICT (add/add): Merge conflict in src/test/test-static-destruct.c Auto-merging src/test/test-stat-util.c CONFLICT (add/add): Merge conflict in src/test/test-stat-util.c Auto-merging src/test/test-specifier.c CONFLICT (add/add): Merge conflict in src/test/test-specifier.c Auto-merging src/test/test-socket-util.c CONFLICT (add/add): Merge conflict in src/test/test-socket-util.c Auto-merging src/test/test-socket-netlink.c CONFLICT (add/add): Merge conflict in src/test/test-socket-netlink.c Auto-merging src/test/test-sleep.c CONFLICT (add/add): Merge conflict in src/test/test-sleep.c Auto-merging src/test/test-sizeof.c CONFLICT (add/add): Merge conflict in src/test/test-sizeof.c Auto-merging src/test/test-siphash24.c CONFLICT (add/add): Merge conflict in src/test/test-siphash24.c Auto-merging src/test/test-signal-util.c CONFLICT (add/add): Merge conflict in src/test/test-signal-util.c Auto-merging src/test/test-sigbus.c CONFLICT (add/add): Merge conflict in src/test/test-sigbus.c Auto-merging src/test/test-set.c CONFLICT (add/add): Merge conflict in src/test/test-set.c Auto-merging src/test/test-set-disable-mempool.c CONFLICT (add/add): Merge conflict in src/test/test-set-disable-mempool.c Auto-merging src/test/test-serialize.c CONFLICT (add/add): Merge conflict in src/test/test-serialize.c Auto-merging src/test/test-selinux.c CONFLICT (add/add): Merge conflict in src/test/test-selinux.c Auto-merging src/test/test-seccomp.c CONFLICT (add/add): Merge conflict in src/test/test-seccomp.c Auto-merging src/test/test-sd-path.c CONFLICT (add/add): Merge conflict in src/test/test-sd-path.c Auto-merging src/test/test-sd-hwdb.c CONFLICT (add/add): Merge conflict in src/test/test-sd-hwdb.c Auto-merging src/test/test-sched-prio.c CONFLICT (add/add): Merge conflict in src/test/test-sched-prio.c Auto-merging src/test/test-rlimit-util.c CONFLICT (add/add): Merge conflict in src/test/test-rlimit-util.c Auto-merging src/test/test-replace-var.c CONFLICT (add/add): Merge conflict in src/test/test-replace-var.c Auto-merging src/test/test-ratelimit.c CONFLICT (add/add): Merge conflict in src/test/test-ratelimit.c Auto-merging src/test/test-random-util.c CONFLICT (add/add): Merge conflict in src/test/test-random-util.c Auto-merging src/test/test-procfs-util.c CONFLICT (add/add): Merge conflict in src/test/test-procfs-util.c Auto-merging src/test/test-process-util.c CONFLICT (add/add): Merge conflict in src/test/test-process-util.c Auto-merging src/test/test-proc-cmdline.c CONFLICT (add/add): Merge conflict in src/test/test-proc-cmdline.c Auto-merging src/test/test-prioq.c CONFLICT (add/add): Merge conflict in src/test/test-prioq.c Auto-merging src/test/test-pretty-print.c CONFLICT (add/add): Merge conflict in src/test/test-pretty-print.c Auto-merging src/test/test-path.c CONFLICT (add/add): Merge conflict in src/test/test-path.c Auto-merging src/test/test-path-util.c CONFLICT (add/add): Merge conflict in src/test/test-path-util.c Auto-merging src/test/test-path-lookup.c CONFLICT (add/add): Merge conflict in src/test/test-path-lookup.c Auto-merging src/test/test-parse-util.c CONFLICT (add/add): Merge conflict in src/test/test-parse-util.c Auto-merging src/test/test-os-util.c CONFLICT (add/add): Merge conflict in src/test/test-os-util.c Auto-merging src/test/test-ordered-set.c CONFLICT (add/add): Merge conflict in src/test/test-ordered-set.c Auto-merging src/test/test-nss.c CONFLICT (add/add): Merge conflict in src/test/test-nss.c Auto-merging src/test/test-nscd-flush.c CONFLICT (add/add): Merge conflict in src/test/test-nscd-flush.c Auto-merging src/test/test-ns.c CONFLICT (add/add): Merge conflict in src/test/test-ns.c Auto-merging src/test/test-netlink-manual.c CONFLICT (add/add): Merge conflict in src/test/test-netlink-manual.c Auto-merging src/test/test-namespace.c CONFLICT (add/add): Merge conflict in src/test/test-namespace.c Auto-merging src/test/test-mountpoint-util.c CONFLICT (add/add): Merge conflict in src/test/test-mountpoint-util.c Auto-merging src/test/test-mount-util.c CONFLICT (add/add): Merge conflict in src/test/test-mount-util.c Auto-merging src/test/test-loopback.c CONFLICT (add/add): Merge conflict in src/test/test-loopback.c Auto-merging src/test/test-log.c CONFLICT (add/add): Merge conflict in src/test/test-log.c Auto-merging src/test/test-locale-util.c CONFLICT (add/add): Merge conflict in src/test/test-locale-util.c Auto-merging src/test/test-local-addresses.c CONFLICT (add/add): Merge conflict in src/test/test-local-addresses.c Auto-merging src/test/test-load-fragment.c CONFLICT (add/add): Merge conflict in src/test/test-load-fragment.c Auto-merging src/test/test-list.c CONFLICT (add/add): Merge conflict in src/test/test-list.c Auto-merging src/test/test-libudev.c CONFLICT (add/add): Merge conflict in src/test/test-libudev.c Auto-merging src/test/test-libmount.c CONFLICT (add/add): Merge conflict in src/test/test-libmount.c Auto-merging src/test/test-json.c CONFLICT (add/add): Merge conflict in src/test/test-json.c Auto-merging src/test/test-journal-importer.c CONFLICT (add/add): Merge conflict in src/test/test-journal-importer.c Auto-merging src/test/test-job-type.c CONFLICT (add/add): Merge conflict in src/test/test-job-type.c Auto-merging src/test/test-ipcrm.c CONFLICT (add/add): Merge conflict in src/test/test-ipcrm.c Auto-merging src/test/test-ip-protocol-list.c CONFLICT (add/add): Merge conflict in src/test/test-ip-protocol-list.c Auto-merging src/test/test-io-util.c CONFLICT (add/add): Merge conflict in src/test/test-io-util.c Auto-merging src/test/test-install.c CONFLICT (add/add): Merge conflict in src/test/test-install.c Auto-merging src/test/test-install-root.c CONFLICT (add/add): Merge conflict in src/test/test-install-root.c Auto-merging src/test/test-in-addr-util.c CONFLICT (add/add): Merge conflict in src/test/test-in-addr-util.c Auto-merging src/test/test-id128.c CONFLICT (add/add): Merge conflict in src/test/test-id128.c Auto-merging src/test/test-hostname.c CONFLICT (add/add): Merge conflict in src/test/test-hostname.c Auto-merging src/test/test-hostname-util.c CONFLICT (add/add): Merge conflict in src/test/test-hostname-util.c Auto-merging src/test/test-hexdecoct.c CONFLICT (add/add): Merge conflict in src/test/test-hexdecoct.c Auto-merging src/test/test-hashmap.c CONFLICT (add/add): Merge conflict in src/test/test-hashmap.c Auto-merging src/test/test-hashmap-plain.c CONFLICT (add/add): Merge conflict in src/test/test-hashmap-plain.c Auto-merging src/test/test-hash.c CONFLICT (add/add): Merge conflict in src/test/test-hash.c Auto-merging src/test/test-glob-util.c CONFLICT (add/add): Merge conflict in src/test/test-glob-util.c Auto-merging src/test/test-gcrypt-util.c CONFLICT (add/add): Merge conflict in src/test/test-gcrypt-util.c Auto-merging src/test/test-fstab-util.c CONFLICT (add/add): Merge conflict in src/test/test-fstab-util.c Auto-merging src/test/test-fs-util.c CONFLICT (add/add): Merge conflict in src/test/test-fs-util.c Auto-merging src/test/test-format-util.c CONFLICT (add/add): Merge conflict in src/test/test-format-util.c Auto-merging src/test/test-format-table.c CONFLICT (add/add): Merge conflict in src/test/test-format-table.c Auto-merging src/test/test-firewall-util.c CONFLICT (add/add): Merge conflict in src/test/test-firewall-util.c Auto-merging src/test/test-fileio.c CONFLICT (add/add): Merge conflict in src/test/test-fileio.c Auto-merging src/test/test-fdset.c CONFLICT (add/add): Merge conflict in src/test/test-fdset.c Auto-merging src/test/test-fd-util.c CONFLICT (add/add): Merge conflict in src/test/test-fd-util.c Auto-merging src/test/test-extract-word.c CONFLICT (add/add): Merge conflict in src/test/test-extract-word.c Auto-merging src/test/test-exit-status.c CONFLICT (add/add): Merge conflict in src/test/test-exit-status.c Auto-merging src/test/test-execute.c CONFLICT (add/add): Merge conflict in src/test/test-execute.c Auto-merging src/test/test-exec-util.c CONFLICT (add/add): Merge conflict in src/test/test-exec-util.c Auto-merging src/test/test-escape.c CONFLICT (add/add): Merge conflict in src/test/test-escape.c Auto-merging src/test/test-env-util.c CONFLICT (add/add): Merge conflict in src/test/test-env-util.c Auto-merging src/test/test-env-file.c CONFLICT (add/add): Merge conflict in src/test/test-env-file.c Auto-merging src/test/test-engine.c CONFLICT (add/add): Merge conflict in src/test/test-engine.c Auto-merging src/test/test-emergency-action.c CONFLICT (add/add): Merge conflict in src/test/test-emergency-action.c Auto-merging src/test/test-ellipsize.c CONFLICT (add/add): Merge conflict in src/test/test-ellipsize.c Auto-merging src/test/test-dns-domain.c CONFLICT (add/add): Merge conflict in src/test/test-dns-domain.c Auto-merging src/test/test-dlopen.c CONFLICT (add/add): Merge conflict in src/test/test-dlopen.c Auto-merging src/test/test-device-nodes.c CONFLICT (add/add): Merge conflict in src/test/test-device-nodes.c Auto-merging src/test/test-dev-setup.c CONFLICT (add/add): Merge conflict in src/test/test-dev-setup.c Auto-merging src/test/test-date.c CONFLICT (add/add): Merge conflict in src/test/test-date.c Auto-merging src/test/test-daemon.c CONFLICT (add/add): Merge conflict in src/test/test-daemon.c Auto-merging src/test/test-cpu-set-util.c CONFLICT (add/add): Merge conflict in src/test/test-cpu-set-util.c Auto-merging src/test/test-coredump-util.c CONFLICT (add/add): Merge conflict in src/test/test-coredump-util.c Auto-merging src/test/test-copy.c CONFLICT (add/add): Merge conflict in src/test/test-copy.c Auto-merging src/test/test-conf-parser.c CONFLICT (add/add): Merge conflict in src/test/test-conf-parser.c Auto-merging src/test/test-conf-files.c CONFLICT (add/add): Merge conflict in src/test/test-conf-files.c Auto-merging src/test/test-condition.c CONFLICT (add/add): Merge conflict in src/test/test-condition.c Auto-merging src/test/test-clock.c CONFLICT (add/add): Merge conflict in src/test/test-clock.c Auto-merging src/test/test-chown-rec.c CONFLICT (add/add): Merge conflict in src/test/test-chown-rec.c Auto-merging src/test/test-chase-symlinks.c CONFLICT (add/add): Merge conflict in src/test/test-chase-symlinks.c Auto-merging src/test/test-cgroup.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup.c Auto-merging src/test/test-cgroup-util.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-util.c Auto-merging src/test/test-cgroup-unit-default.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-unit-default.c Auto-merging src/test/test-cgroup-setup.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-setup.c Auto-merging src/test/test-cgroup-mask.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-mask.c Auto-merging src/test/test-cgroup-cpu.c CONFLICT (add/add): Merge conflict in src/test/test-cgroup-cpu.c Auto-merging src/test/test-capability.c CONFLICT (add/add): Merge conflict in src/test/test-capability.c Auto-merging src/test/test-cap-list.c CONFLICT (add/add): Merge conflict in src/test/test-cap-list.c Auto-merging src/test/test-calendarspec.c CONFLICT (add/add): Merge conflict in src/test/test-calendarspec.c Auto-merging src/test/test-bus-util.c CONFLICT (add/add): Merge conflict in src/test/test-bus-util.c Auto-merging src/test/test-btrfs.c CONFLICT (add/add): Merge conflict in src/test/test-btrfs.c Auto-merging src/test/test-bpf-firewall.c CONFLICT (add/add): Merge conflict in src/test/test-bpf-firewall.c Auto-merging src/test/test-bpf-devices.c CONFLICT (add/add): Merge conflict in src/test/test-bpf-devices.c Auto-merging src/test/test-boot-timestamps.c CONFLICT (add/add): Merge conflict in src/test/test-boot-timestamps.c Auto-merging src/test/test-bitmap.c CONFLICT (add/add): Merge conflict in src/test/test-bitmap.c Auto-merging src/test/test-barrier.c CONFLICT (add/add): Merge conflict in src/test/test-barrier.c Auto-merging src/test/test-async.c CONFLICT (add/add): Merge conflict in src/test/test-async.c Auto-merging src/test/test-ask-password-api.c CONFLICT (add/add): Merge conflict in src/test/test-ask-password-api.c Auto-merging src/test/test-arphrd-list.c CONFLICT (add/add): Merge conflict in src/test/test-arphrd-list.c Auto-merging src/test/test-architecture.c CONFLICT (add/add): Merge conflict in src/test/test-architecture.c Auto-merging src/test/test-alloc-util.c CONFLICT (add/add): Merge conflict in src/test/test-alloc-util.c Auto-merging src/test/test-af-list.c CONFLICT (add/add): Merge conflict in src/test/test-af-list.c Auto-merging src/test/test-acl-util.c CONFLICT (add/add): Merge conflict in src/test/test-acl-util.c Auto-merging src/test/meson.build CONFLICT (add/add): Merge conflict in src/test/meson.build Auto-merging src/sysv-generator/sysv-generator.c CONFLICT (add/add): Merge conflict in src/sysv-generator/sysv-generator.c Auto-merging src/sysusers/sysusers.c CONFLICT (add/add): Merge conflict in src/sysusers/sysusers.c Auto-merging src/systemd/sd-utf8.h CONFLICT (add/add): Merge conflict in src/systemd/sd-utf8.h Auto-merging src/systemd/sd-resolve.h CONFLICT (add/add): Merge conflict in src/systemd/sd-resolve.h Auto-merging src/systemd/sd-radv.h CONFLICT (add/add): Merge conflict in src/systemd/sd-radv.h Auto-merging src/systemd/sd-path.h CONFLICT (add/add): Merge conflict in src/systemd/sd-path.h Auto-merging src/systemd/sd-network.h CONFLICT (add/add): Merge conflict in src/systemd/sd-network.h Auto-merging src/systemd/sd-netlink.h CONFLICT (add/add): Merge conflict in src/systemd/sd-netlink.h Auto-merging src/systemd/sd-ndisc.h CONFLICT (add/add): Merge conflict in src/systemd/sd-ndisc.h Auto-merging src/systemd/sd-messages.h CONFLICT (add/add): Merge conflict in src/systemd/sd-messages.h Auto-merging src/systemd/sd-login.h CONFLICT (add/add): Merge conflict in src/systemd/sd-login.h Auto-merging src/systemd/sd-lldp.h CONFLICT (add/add): Merge conflict in src/systemd/sd-lldp.h Auto-merging src/systemd/sd-journal.h CONFLICT (add/add): Merge conflict in src/systemd/sd-journal.h Auto-merging src/systemd/sd-ipv4ll.h CONFLICT (add/add): Merge conflict in src/systemd/sd-ipv4ll.h Auto-merging src/systemd/sd-ipv4acd.h CONFLICT (add/add): Merge conflict in src/systemd/sd-ipv4acd.h Auto-merging src/systemd/sd-id128.h CONFLICT (add/add): Merge conflict in src/systemd/sd-id128.h Auto-merging src/systemd/sd-hwdb.h CONFLICT (add/add): Merge conflict in src/systemd/sd-hwdb.h Auto-merging src/systemd/sd-event.h CONFLICT (add/add): Merge conflict in src/systemd/sd-event.h Auto-merging src/systemd/sd-dhcp6-option.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp6-option.h Auto-merging src/systemd/sd-dhcp6-lease.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp6-lease.h Auto-merging src/systemd/sd-dhcp6-client.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp6-client.h Auto-merging src/systemd/sd-dhcp-server.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp-server.h Auto-merging src/systemd/sd-dhcp-option.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp-option.h Auto-merging src/systemd/sd-dhcp-lease.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp-lease.h Auto-merging src/systemd/sd-dhcp-client.h CONFLICT (add/add): Merge conflict in src/systemd/sd-dhcp-client.h Auto-merging src/systemd/sd-device.h CONFLICT (add/add): Merge conflict in src/systemd/sd-device.h Auto-merging src/systemd/sd-daemon.h CONFLICT (add/add): Merge conflict in src/systemd/sd-daemon.h Auto-merging src/systemd/sd-bus.h CONFLICT (add/add): Merge conflict in src/systemd/sd-bus.h Auto-merging src/systemd/sd-bus-vtable.h CONFLICT (add/add): Merge conflict in src/systemd/sd-bus-vtable.h Auto-merging src/systemd/sd-bus-protocol.h CONFLICT (add/add): Merge conflict in src/systemd/sd-bus-protocol.h Auto-merging src/systemd/meson.build CONFLICT (add/add): Merge conflict in src/systemd/meson.build Auto-merging src/systemd/_sd-common.h CONFLICT (add/add): Merge conflict in src/systemd/_sd-common.h Auto-merging src/systemctl/systemctl.c CONFLICT (add/add): Merge conflict in src/systemctl/systemctl.c Auto-merging src/system-update-generator/system-update-generator.c CONFLICT (add/add): Merge conflict in src/system-update-generator/system-update-generator.c Auto-merging src/sysctl/sysctl.c CONFLICT (add/add): Merge conflict in src/sysctl/sysctl.c Auto-merging src/sulogin-shell/sulogin-shell.c CONFLICT (add/add): Merge conflict in src/sulogin-shell/sulogin-shell.c Auto-merging src/stdio-bridge/stdio-bridge.c CONFLICT (add/add): Merge conflict in src/stdio-bridge/stdio-bridge.c Auto-merging src/socket-proxy/socket-proxyd.c CONFLICT (add/add): Merge conflict in src/socket-proxy/socket-proxyd.c Auto-merging src/sleep/sleep.c CONFLICT (add/add): Merge conflict in src/sleep/sleep.c Auto-merging src/shutdown/umount.h CONFLICT (add/add): Merge conflict in src/shutdown/umount.h Auto-merging src/shutdown/umount.c CONFLICT (add/add): Merge conflict in src/shutdown/umount.c Auto-merging src/shutdown/shutdown.c CONFLICT (add/add): Merge conflict in src/shutdown/shutdown.c Auto-merging src/shared/xml.h CONFLICT (add/add): Merge conflict in src/shared/xml.h Auto-merging src/shared/xml.c CONFLICT (add/add): Merge conflict in src/shared/xml.c Auto-merging src/shared/wifi-util.h CONFLICT (add/add): Merge conflict in src/shared/wifi-util.h Auto-merging src/shared/wifi-util.c CONFLICT (add/add): Merge conflict in src/shared/wifi-util.c Auto-merging src/shared/web-util.h CONFLICT (add/add): Merge conflict in src/shared/web-util.h Auto-merging src/shared/web-util.c CONFLICT (add/add): Merge conflict in src/shared/web-util.c Auto-merging src/shared/watchdog.h CONFLICT (add/add): Merge conflict in src/shared/watchdog.h Auto-merging src/shared/watchdog.c CONFLICT (add/add): Merge conflict in src/shared/watchdog.c Auto-merging src/shared/volatile-util.h CONFLICT (add/add): Merge conflict in src/shared/volatile-util.h Auto-merging src/shared/volatile-util.c CONFLICT (add/add): Merge conflict in src/shared/volatile-util.c Auto-merging src/shared/vlan-util.h CONFLICT (add/add): Merge conflict in src/shared/vlan-util.h Auto-merging src/shared/vlan-util.c CONFLICT (add/add): Merge conflict in src/shared/vlan-util.c Auto-merging src/shared/verbs.h CONFLICT (add/add): Merge conflict in src/shared/verbs.h Auto-merging src/shared/verbs.c CONFLICT (add/add): Merge conflict in src/shared/verbs.c Auto-merging src/shared/varlink.h CONFLICT (add/add): Merge conflict in src/shared/varlink.h Auto-merging src/shared/varlink.c CONFLICT (add/add): Merge conflict in src/shared/varlink.c Auto-merging src/shared/utmp-wtmp.h CONFLICT (add/add): Merge conflict in src/shared/utmp-wtmp.h Auto-merging src/shared/utmp-wtmp.c CONFLICT (add/add): Merge conflict in src/shared/utmp-wtmp.c Auto-merging src/shared/userdb.h CONFLICT (add/add): Merge conflict in src/shared/userdb.h Auto-merging src/shared/userdb.c CONFLICT (add/add): Merge conflict in src/shared/userdb.c Auto-merging src/shared/user-record.h CONFLICT (add/add): Merge conflict in src/shared/user-record.h Auto-merging src/shared/user-record.c CONFLICT (add/add): Merge conflict in src/shared/user-record.c Auto-merging src/shared/user-record-show.h CONFLICT (add/add): Merge conflict in src/shared/user-record-show.h Auto-merging src/shared/user-record-show.c CONFLICT (add/add): Merge conflict in src/shared/user-record-show.c Auto-merging src/shared/user-record-nss.h CONFLICT (add/add): Merge conflict in src/shared/user-record-nss.h Auto-merging src/shared/user-record-nss.c CONFLICT (add/add): Merge conflict in src/shared/user-record-nss.c Auto-merging src/shared/unit-file.h CONFLICT (add/add): Merge conflict in src/shared/unit-file.h Auto-merging src/shared/unit-file.c CONFLICT (add/add): Merge conflict in src/shared/unit-file.c Auto-merging src/shared/uid-range.h CONFLICT (add/add): Merge conflict in src/shared/uid-range.h Auto-merging src/shared/uid-range.c CONFLICT (add/add): Merge conflict in src/shared/uid-range.c Auto-merging src/shared/udev-util.h CONFLICT (add/add): Merge conflict in src/shared/udev-util.h Auto-merging src/shared/udev-util.c CONFLICT (add/add): Merge conflict in src/shared/udev-util.c Auto-merging src/shared/tomoyo-util.h CONFLICT (add/add): Merge conflict in src/shared/tomoyo-util.h Auto-merging src/shared/tomoyo-util.c CONFLICT (add/add): Merge conflict in src/shared/tomoyo-util.c Auto-merging src/shared/tmpfile-util-label.h CONFLICT (add/add): Merge conflict in src/shared/tmpfile-util-label.h Auto-merging src/shared/tmpfile-util-label.c CONFLICT (add/add): Merge conflict in src/shared/tmpfile-util-label.c Auto-merging src/shared/tests.h CONFLICT (add/add): Merge conflict in src/shared/tests.h Auto-merging src/shared/tests.c CONFLICT (add/add): Merge conflict in src/shared/tests.c Auto-merging src/shared/test-tables.h CONFLICT (add/add): Merge conflict in src/shared/test-tables.h Auto-merging src/shared/sysctl-util.h CONFLICT (add/add): Merge conflict in src/shared/sysctl-util.h Auto-merging src/shared/sysctl-util.c CONFLICT (add/add): Merge conflict in src/shared/sysctl-util.c Auto-merging src/shared/switch-root.h CONFLICT (add/add): Merge conflict in src/shared/switch-root.h Auto-merging src/shared/switch-root.c CONFLICT (add/add): Merge conflict in src/shared/switch-root.c Auto-merging src/shared/specifier.h CONFLICT (add/add): Merge conflict in src/shared/specifier.h Auto-merging src/shared/specifier.c CONFLICT (add/add): Merge conflict in src/shared/specifier.c Auto-merging src/shared/spawn-polkit-agent.h CONFLICT (add/add): Merge conflict in src/shared/spawn-polkit-agent.h Auto-merging src/shared/spawn-polkit-agent.c CONFLICT (add/add): Merge conflict in src/shared/spawn-polkit-agent.c Auto-merging src/shared/spawn-ask-password-agent.h CONFLICT (add/add): Merge conflict in src/shared/spawn-ask-password-agent.h Auto-merging src/shared/spawn-ask-password-agent.c CONFLICT (add/add): Merge conflict in src/shared/spawn-ask-password-agent.c Auto-merging src/shared/socket-netlink.h CONFLICT (add/add): Merge conflict in src/shared/socket-netlink.h Auto-merging src/shared/socket-netlink.c CONFLICT (add/add): Merge conflict in src/shared/socket-netlink.c Auto-merging src/shared/sleep-config.h CONFLICT (add/add): Merge conflict in src/shared/sleep-config.h Auto-merging src/shared/sleep-config.c CONFLICT (add/add): Merge conflict in src/shared/sleep-config.c Auto-merging src/shared/service-util.h CONFLICT (add/add): Merge conflict in src/shared/service-util.h Auto-merging src/shared/service-util.c CONFLICT (add/add): Merge conflict in src/shared/service-util.c Auto-merging src/shared/serialize.h CONFLICT (add/add): Merge conflict in src/shared/serialize.h Auto-merging src/shared/serialize.c CONFLICT (add/add): Merge conflict in src/shared/serialize.c Auto-merging src/shared/securebits-util.h CONFLICT (add/add): Merge conflict in src/shared/securebits-util.h Auto-merging src/shared/securebits-util.c CONFLICT (add/add): Merge conflict in src/shared/securebits-util.c Auto-merging src/shared/seccomp-util.h CONFLICT (add/add): Merge conflict in src/shared/seccomp-util.h Auto-merging src/shared/seccomp-util.c CONFLICT (add/add): Merge conflict in src/shared/seccomp-util.c Auto-merging src/shared/resolve-util.h CONFLICT (add/add): Merge conflict in src/shared/resolve-util.h Auto-merging src/shared/resolve-util.c CONFLICT (add/add): Merge conflict in src/shared/resolve-util.c Auto-merging src/shared/resize-fs.h CONFLICT (add/add): Merge conflict in src/shared/resize-fs.h Auto-merging src/shared/resize-fs.c CONFLICT (add/add): Merge conflict in src/shared/resize-fs.c Auto-merging src/shared/reboot-util.h CONFLICT (add/add): Merge conflict in src/shared/reboot-util.h Auto-merging src/shared/reboot-util.c CONFLICT (add/add): Merge conflict in src/shared/reboot-util.c Auto-merging src/shared/ptyfwd.h CONFLICT (add/add): Merge conflict in src/shared/ptyfwd.h Auto-merging src/shared/ptyfwd.c CONFLICT (add/add): Merge conflict in src/shared/ptyfwd.c Auto-merging src/shared/pretty-print.h CONFLICT (add/add): Merge conflict in src/shared/pretty-print.h Auto-merging src/shared/pretty-print.c CONFLICT (add/add): Merge conflict in src/shared/pretty-print.c Auto-merging src/shared/pkcs11-util.h CONFLICT (add/add): Merge conflict in src/shared/pkcs11-util.h Auto-merging src/shared/pkcs11-util.c CONFLICT (add/add): Merge conflict in src/shared/pkcs11-util.c Auto-merging src/shared/pe-header.h CONFLICT (add/add): Merge conflict in src/shared/pe-header.h Auto-merging src/shared/pam-util.h CONFLICT (add/add): Merge conflict in src/shared/pam-util.h Auto-merging src/shared/pam-util.c CONFLICT (add/add): Merge conflict in src/shared/pam-util.c Auto-merging src/shared/pager.h CONFLICT (add/add): Merge conflict in src/shared/pager.h Auto-merging src/shared/pager.c CONFLICT (add/add): Merge conflict in src/shared/pager.c Auto-merging src/shared/output-mode.h CONFLICT (add/add): Merge conflict in src/shared/output-mode.h Auto-merging src/shared/output-mode.c CONFLICT (add/add): Merge conflict in src/shared/output-mode.c Auto-merging src/shared/os-util.h CONFLICT (add/add): Merge conflict in src/shared/os-util.h Auto-merging src/shared/os-util.c CONFLICT (add/add): Merge conflict in src/shared/os-util.c Auto-merging src/shared/openssl-util.h CONFLICT (add/add): Merge conflict in src/shared/openssl-util.h Auto-merging src/shared/numa-util.h CONFLICT (add/add): Merge conflict in src/shared/numa-util.h Auto-merging src/shared/numa-util.c CONFLICT (add/add): Merge conflict in src/shared/numa-util.c Auto-merging src/shared/nsflags.h CONFLICT (add/add): Merge conflict in src/shared/nsflags.h Auto-merging src/shared/nsflags.c CONFLICT (add/add): Merge conflict in src/shared/nsflags.c Auto-merging src/shared/nscd-flush.h CONFLICT (add/add): Merge conflict in src/shared/nscd-flush.h Auto-merging src/shared/nscd-flush.c CONFLICT (add/add): Merge conflict in src/shared/nscd-flush.c Auto-merging src/shared/netif-naming-scheme.h CONFLICT (add/add): Merge conflict in src/shared/netif-naming-scheme.h Auto-merging src/shared/netif-naming-scheme.c CONFLICT (add/add): Merge conflict in src/shared/netif-naming-scheme.c Auto-merging src/shared/mount-util.h CONFLICT (add/add): Merge conflict in src/shared/mount-util.h Auto-merging src/shared/mount-util.c CONFLICT (add/add): Merge conflict in src/shared/mount-util.c Auto-merging src/shared/module-util.h CONFLICT (add/add): Merge conflict in src/shared/module-util.h Auto-merging src/shared/module-util.c CONFLICT (add/add): Merge conflict in src/shared/module-util.c Auto-merging src/shared/meson.build CONFLICT (add/add): Merge conflict in src/shared/meson.build Auto-merging src/shared/main-func.h CONFLICT (add/add): Merge conflict in src/shared/main-func.h Auto-merging src/shared/macvlan-util.h CONFLICT (add/add): Merge conflict in src/shared/macvlan-util.h Auto-merging src/shared/macvlan-util.c CONFLICT (add/add): Merge conflict in src/shared/macvlan-util.c Auto-merging src/shared/machine-pool.h CONFLICT (add/add): Merge conflict in src/shared/machine-pool.h Auto-merging src/shared/machine-pool.c CONFLICT (add/add): Merge conflict in src/shared/machine-pool.c Auto-merging src/shared/machine-image.h CONFLICT (add/add): Merge conflict in src/shared/machine-image.h Auto-merging src/shared/machine-image.c CONFLICT (add/add): Merge conflict in src/shared/machine-image.c Auto-merging src/shared/loop-util.h CONFLICT (add/add): Merge conflict in src/shared/loop-util.h Auto-merging src/shared/loop-util.c CONFLICT (add/add): Merge conflict in src/shared/loop-util.c Auto-merging src/shared/logs-show.h CONFLICT (add/add): Merge conflict in src/shared/logs-show.h Auto-merging src/shared/logs-show.c CONFLICT (add/add): Merge conflict in src/shared/logs-show.c Auto-merging src/shared/log-link.h CONFLICT (add/add): Merge conflict in src/shared/log-link.h Auto-merging src/shared/lockfile-util.h CONFLICT (add/add): Merge conflict in src/shared/lockfile-util.h Auto-merging src/shared/lockfile-util.c CONFLICT (add/add): Merge conflict in src/shared/lockfile-util.c Auto-merging src/shared/local-addresses.h CONFLICT (add/add): Merge conflict in src/shared/local-addresses.h Auto-merging src/shared/local-addresses.c CONFLICT (add/add): Merge conflict in src/shared/local-addresses.c Auto-merging src/shared/linux/nl80211.h CONFLICT (add/add): Merge conflict in src/shared/linux/nl80211.h Auto-merging src/shared/linux/ethtool.h CONFLICT (add/add): Merge conflict in src/shared/linux/ethtool.h Auto-merging src/shared/libmount-util.h CONFLICT (add/add): Merge conflict in src/shared/libmount-util.h Auto-merging src/shared/libcrypt-util.h CONFLICT (add/add): Merge conflict in src/shared/libcrypt-util.h Auto-merging src/shared/libcrypt-util.c CONFLICT (add/add): Merge conflict in src/shared/libcrypt-util.c Auto-merging src/shared/json.h CONFLICT (add/add): Merge conflict in src/shared/json.h Auto-merging src/shared/json.c CONFLICT (add/add): Merge conflict in src/shared/json.c Auto-merging src/shared/json-internal.h CONFLICT (add/add): Merge conflict in src/shared/json-internal.h Auto-merging src/shared/journal-util.h CONFLICT (add/add): Merge conflict in src/shared/journal-util.h Auto-merging src/shared/journal-util.c CONFLICT (add/add): Merge conflict in src/shared/journal-util.c Auto-merging src/shared/journal-importer.h CONFLICT (add/add): Merge conflict in src/shared/journal-importer.h Auto-merging src/shared/journal-importer.c CONFLICT (add/add): Merge conflict in src/shared/journal-importer.c Auto-merging src/shared/ipvlan-util.h CONFLICT (add/add): Merge conflict in src/shared/ipvlan-util.h Auto-merging src/shared/ipvlan-util.c CONFLICT (add/add): Merge conflict in src/shared/ipvlan-util.c Auto-merging src/shared/ip-protocol-list.h CONFLICT (add/add): Merge conflict in src/shared/ip-protocol-list.h Auto-merging src/shared/ip-protocol-list.c CONFLICT (add/add): Merge conflict in src/shared/ip-protocol-list.c Auto-merging src/shared/install.h CONFLICT (add/add): Merge conflict in src/shared/install.h Auto-merging src/shared/install.c CONFLICT (add/add): Merge conflict in src/shared/install.c Auto-merging src/shared/install-printf.h CONFLICT (add/add): Merge conflict in src/shared/install-printf.h Auto-merging src/shared/install-printf.c CONFLICT (add/add): Merge conflict in src/shared/install-printf.c Auto-merging src/shared/initreq.h CONFLICT (add/add): Merge conflict in src/shared/initreq.h Auto-merging src/shared/import-util.h CONFLICT (add/add): Merge conflict in src/shared/import-util.h Auto-merging src/shared/import-util.c CONFLICT (add/add): Merge conflict in src/shared/import-util.c Auto-merging src/shared/ima-util.h CONFLICT (add/add): Merge conflict in src/shared/ima-util.h Auto-merging src/shared/ima-util.c CONFLICT (add/add): Merge conflict in src/shared/ima-util.c Auto-merging src/shared/id128-print.h CONFLICT (add/add): Merge conflict in src/shared/id128-print.h Auto-merging src/shared/id128-print.c CONFLICT (add/add): Merge conflict in src/shared/id128-print.c Auto-merging src/shared/group-record.h CONFLICT (add/add): Merge conflict in src/shared/group-record.h Auto-merging src/shared/group-record.c CONFLICT (add/add): Merge conflict in src/shared/group-record.c Auto-merging src/shared/gpt.h CONFLICT (add/add): Merge conflict in src/shared/gpt.h Auto-merging src/shared/gpt.c CONFLICT (add/add): Merge conflict in src/shared/gpt.c Auto-merging src/shared/geneve-util.h CONFLICT (add/add): Merge conflict in src/shared/geneve-util.h Auto-merging src/shared/geneve-util.c CONFLICT (add/add): Merge conflict in src/shared/geneve-util.c Auto-merging src/shared/generator.h CONFLICT (add/add): Merge conflict in src/shared/generator.h Auto-merging src/shared/generator.c CONFLICT (add/add): Merge conflict in src/shared/generator.c Auto-merging src/shared/fstab-util.h CONFLICT (add/add): Merge conflict in src/shared/fstab-util.h Auto-merging src/shared/fstab-util.c CONFLICT (add/add): Merge conflict in src/shared/fstab-util.c Auto-merging src/shared/fsck-util.h CONFLICT (add/add): Merge conflict in src/shared/fsck-util.h Auto-merging src/shared/format-table.h CONFLICT (add/add): Merge conflict in src/shared/format-table.h Auto-merging src/shared/format-table.c CONFLICT (add/add): Merge conflict in src/shared/format-table.c Auto-merging src/shared/firewall-util.h CONFLICT (add/add): Merge conflict in src/shared/firewall-util.h Auto-merging src/shared/firewall-util.c CONFLICT (add/add): Merge conflict in src/shared/firewall-util.c Auto-merging src/shared/fileio-label.h CONFLICT (add/add): Merge conflict in src/shared/fileio-label.h Auto-merging src/shared/fileio-label.c CONFLICT (add/add): Merge conflict in src/shared/fileio-label.c Auto-merging src/shared/fdset.h CONFLICT (add/add): Merge conflict in src/shared/fdset.h Auto-merging src/shared/fdset.c CONFLICT (add/add): Merge conflict in src/shared/fdset.c Auto-merging src/shared/exit-status.h CONFLICT (add/add): Merge conflict in src/shared/exit-status.h Auto-merging src/shared/exit-status.c CONFLICT (add/add): Merge conflict in src/shared/exit-status.c Auto-merging src/shared/exec-util.h CONFLICT (add/add): Merge conflict in src/shared/exec-util.h Auto-merging src/shared/exec-util.c CONFLICT (add/add): Merge conflict in src/shared/exec-util.c Auto-merging src/shared/ethtool-util.h CONFLICT (add/add): Merge conflict in src/shared/ethtool-util.h Auto-merging src/shared/ethtool-util.c CONFLICT (add/add): Merge conflict in src/shared/ethtool-util.c Auto-merging src/shared/env-file-label.h CONFLICT (add/add): Merge conflict in src/shared/env-file-label.h Auto-merging src/shared/env-file-label.c CONFLICT (add/add): Merge conflict in src/shared/env-file-label.c Auto-merging src/shared/enable-mempool.c CONFLICT (add/add): Merge conflict in src/shared/enable-mempool.c Auto-merging src/shared/efi-loader.h CONFLICT (add/add): Merge conflict in src/shared/efi-loader.h Auto-merging src/shared/efi-loader.c CONFLICT (add/add): Merge conflict in src/shared/efi-loader.c Auto-merging src/shared/dropin.h CONFLICT (add/add): Merge conflict in src/shared/dropin.h Auto-merging src/shared/dropin.c CONFLICT (add/add): Merge conflict in src/shared/dropin.c Auto-merging src/shared/dns-domain.h CONFLICT (add/add): Merge conflict in src/shared/dns-domain.h Auto-merging src/shared/dns-domain.c CONFLICT (add/add): Merge conflict in src/shared/dns-domain.c Auto-merging src/shared/dm-util.h CONFLICT (add/add): Merge conflict in src/shared/dm-util.h Auto-merging src/shared/dm-util.c CONFLICT (add/add): Merge conflict in src/shared/dm-util.c Auto-merging src/shared/dissect-image.h CONFLICT (add/add): Merge conflict in src/shared/dissect-image.h Auto-merging src/shared/dissect-image.c CONFLICT (add/add): Merge conflict in src/shared/dissect-image.c Auto-merging src/shared/dev-setup.h CONFLICT (add/add): Merge conflict in src/shared/dev-setup.h Auto-merging src/shared/dev-setup.c CONFLICT (add/add): Merge conflict in src/shared/dev-setup.c Auto-merging src/shared/daemon-util.h CONFLICT (add/add): Merge conflict in src/shared/daemon-util.h Auto-merging src/shared/cpu-set-util.h CONFLICT (add/add): Merge conflict in src/shared/cpu-set-util.h Auto-merging src/shared/cpu-set-util.c CONFLICT (add/add): Merge conflict in src/shared/cpu-set-util.c Auto-merging src/shared/coredump-util.h CONFLICT (add/add): Merge conflict in src/shared/coredump-util.h Auto-merging src/shared/coredump-util.c CONFLICT (add/add): Merge conflict in src/shared/coredump-util.c Auto-merging src/shared/conf-parser.h CONFLICT (add/add): Merge conflict in src/shared/conf-parser.h Auto-merging src/shared/conf-parser.c CONFLICT (add/add): Merge conflict in src/shared/conf-parser.c Auto-merging src/shared/condition.h CONFLICT (add/add): Merge conflict in src/shared/condition.h Auto-merging src/shared/condition.c CONFLICT (add/add): Merge conflict in src/shared/condition.c Auto-merging src/shared/clock-util.h CONFLICT (add/add): Merge conflict in src/shared/clock-util.h Auto-merging src/shared/clock-util.c CONFLICT (add/add): Merge conflict in src/shared/clock-util.c Auto-merging src/shared/clean-ipc.h CONFLICT (add/add): Merge conflict in src/shared/clean-ipc.h Auto-merging src/shared/clean-ipc.c CONFLICT (add/add): Merge conflict in src/shared/clean-ipc.c Auto-merging src/shared/chown-recursive.h CONFLICT (add/add): Merge conflict in src/shared/chown-recursive.h Auto-merging src/shared/chown-recursive.c CONFLICT (add/add): Merge conflict in src/shared/chown-recursive.c Auto-merging src/shared/cgroup-show.h CONFLICT (add/add): Merge conflict in src/shared/cgroup-show.h Auto-merging src/shared/cgroup-show.c CONFLICT (add/add): Merge conflict in src/shared/cgroup-show.c Auto-merging src/shared/cgroup-setup.h CONFLICT (add/add): Merge conflict in src/shared/cgroup-setup.h Auto-merging src/shared/cgroup-setup.c CONFLICT (add/add): Merge conflict in src/shared/cgroup-setup.c Auto-merging src/shared/calendarspec.h CONFLICT (add/add): Merge conflict in src/shared/calendarspec.h Auto-merging src/shared/calendarspec.c CONFLICT (add/add): Merge conflict in src/shared/calendarspec.c Auto-merging src/shared/bus-wait-for-units.h CONFLICT (add/add): Merge conflict in src/shared/bus-wait-for-units.h Auto-merging src/shared/bus-wait-for-units.c CONFLICT (add/add): Merge conflict in src/shared/bus-wait-for-units.c Auto-merging src/shared/bus-wait-for-jobs.h CONFLICT (add/add): Merge conflict in src/shared/bus-wait-for-jobs.h Auto-merging src/shared/bus-wait-for-jobs.c CONFLICT (add/add): Merge conflict in src/shared/bus-wait-for-jobs.c Auto-merging src/shared/bus-util.h CONFLICT (add/add): Merge conflict in src/shared/bus-util.h Auto-merging src/shared/bus-util.c CONFLICT (add/add): Merge conflict in src/shared/bus-util.c Auto-merging src/shared/bus-unit-util.h CONFLICT (add/add): Merge conflict in src/shared/bus-unit-util.h Auto-merging src/shared/bus-unit-util.c CONFLICT (add/add): Merge conflict in src/shared/bus-unit-util.c Auto-merging src/shared/bus-unit-procs.h CONFLICT (add/add): Merge conflict in src/shared/bus-unit-procs.h Auto-merging src/shared/bus-unit-procs.c CONFLICT (add/add): Merge conflict in src/shared/bus-unit-procs.c Auto-merging src/shared/bus-polkit.h CONFLICT (add/add): Merge conflict in src/shared/bus-polkit.h Auto-merging src/shared/bus-polkit.c CONFLICT (add/add): Merge conflict in src/shared/bus-polkit.c Auto-merging src/shared/bus-log-control-api.h CONFLICT (add/add): Merge conflict in src/shared/bus-log-control-api.h Auto-merging src/shared/bus-log-control-api.c CONFLICT (add/add): Merge conflict in src/shared/bus-log-control-api.c Auto-merging src/shared/bus-locator.h CONFLICT (add/add): Merge conflict in src/shared/bus-locator.h Auto-merging src/shared/bus-locator.c CONFLICT (add/add): Merge conflict in src/shared/bus-locator.c Auto-merging src/shared/bridge-util.h CONFLICT (add/add): Merge conflict in src/shared/bridge-util.h Auto-merging src/shared/bridge-util.c CONFLICT (add/add): Merge conflict in src/shared/bridge-util.c Auto-merging src/shared/bpf-program.h CONFLICT (add/add): Merge conflict in src/shared/bpf-program.h Auto-merging src/shared/bpf-program.c CONFLICT (add/add): Merge conflict in src/shared/bpf-program.c Auto-merging src/shared/bootspec.h CONFLICT (add/add): Merge conflict in src/shared/bootspec.h Auto-merging src/shared/bootspec.c CONFLICT (add/add): Merge conflict in src/shared/bootspec.c Auto-merging src/shared/boot-timestamps.h CONFLICT (add/add): Merge conflict in src/shared/boot-timestamps.h Auto-merging src/shared/boot-timestamps.c CONFLICT (add/add): Merge conflict in src/shared/boot-timestamps.c Auto-merging src/shared/bond-util.h CONFLICT (add/add): Merge conflict in src/shared/bond-util.h Auto-merging src/shared/bond-util.c CONFLICT (add/add): Merge conflict in src/shared/bond-util.c Auto-merging src/shared/blkid-util.h CONFLICT (add/add): Merge conflict in src/shared/blkid-util.h Auto-merging src/shared/bitmap.h CONFLICT (add/add): Merge conflict in src/shared/bitmap.h Auto-merging src/shared/bitmap.c CONFLICT (add/add): Merge conflict in src/shared/bitmap.c Auto-merging src/shared/binfmt-util.h CONFLICT (add/add): Merge conflict in src/shared/binfmt-util.h Auto-merging src/shared/binfmt-util.c CONFLICT (add/add): Merge conflict in src/shared/binfmt-util.c Auto-merging src/shared/base-filesystem.h CONFLICT (add/add): Merge conflict in src/shared/base-filesystem.h Auto-merging src/shared/base-filesystem.c CONFLICT (add/add): Merge conflict in src/shared/base-filesystem.c Auto-merging src/shared/barrier.h CONFLICT (add/add): Merge conflict in src/shared/barrier.h Auto-merging src/shared/barrier.c CONFLICT (add/add): Merge conflict in src/shared/barrier.c Auto-merging src/shared/ask-password-api.h CONFLICT (add/add): Merge conflict in src/shared/ask-password-api.h Auto-merging src/shared/ask-password-api.c CONFLICT (add/add): Merge conflict in src/shared/ask-password-api.c Auto-merging src/shared/apparmor-util.h CONFLICT (add/add): Merge conflict in src/shared/apparmor-util.h Auto-merging src/shared/apparmor-util.c CONFLICT (add/add): Merge conflict in src/shared/apparmor-util.c Auto-merging src/shared/acpi-fpdt.h CONFLICT (add/add): Merge conflict in src/shared/acpi-fpdt.h Auto-merging src/shared/acpi-fpdt.c CONFLICT (add/add): Merge conflict in src/shared/acpi-fpdt.c Auto-merging src/shared/acl-util.h CONFLICT (add/add): Merge conflict in src/shared/acl-util.h Auto-merging src/shared/acl-util.c CONFLICT (add/add): Merge conflict in src/shared/acl-util.c Auto-merging src/run/run.c CONFLICT (add/add): Merge conflict in src/run/run.c Auto-merging src/run-generator/run-generator.c CONFLICT (add/add): Merge conflict in src/run-generator/run-generator.c Auto-merging src/rfkill/rfkill.c CONFLICT (add/add): Merge conflict in src/rfkill/rfkill.c Auto-merging src/resolve/test-resolved-packet.c CONFLICT (add/add): Merge conflict in src/resolve/test-resolved-packet.c Auto-merging src/resolve/test-resolved-etc-hosts.c CONFLICT (add/add): Merge conflict in src/resolve/test-resolved-etc-hosts.c Auto-merging src/resolve/test-resolve-tables.c CONFLICT (add/add): Merge conflict in src/resolve/test-resolve-tables.c Auto-merging src/resolve/test-dnssec.c CONFLICT (add/add): Merge conflict in src/resolve/test-dnssec.c Auto-merging src/resolve/test-dnssec-complex.c CONFLICT (add/add): Merge conflict in src/resolve/test-dnssec-complex.c Auto-merging src/resolve/test-dns-packet.c CONFLICT (add/add): Merge conflict in src/resolve/test-dns-packet.c Auto-merging src/resolve/resolved.conf.in CONFLICT (add/add): Merge conflict in src/resolve/resolved.conf.in Auto-merging src/resolve/resolved.c CONFLICT (add/add): Merge conflict in src/resolve/resolved.c Auto-merging src/resolve/resolved-resolv-conf.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-resolv-conf.h Auto-merging src/resolve/resolved-resolv-conf.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-resolv-conf.c Auto-merging src/resolve/resolved-mdns.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-mdns.h Auto-merging src/resolve/resolved-mdns.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-mdns.c Auto-merging src/resolve/resolved-manager.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-manager.h Auto-merging src/resolve/resolved-manager.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-manager.c Auto-merging src/resolve/resolved-llmnr.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-llmnr.h Auto-merging src/resolve/resolved-llmnr.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-llmnr.c Auto-merging src/resolve/resolved-link.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-link.h Auto-merging src/resolve/resolved-link.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-link.c Auto-merging src/resolve/resolved-link-bus.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-link-bus.h Auto-merging src/resolve/resolved-link-bus.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-link-bus.c Auto-merging src/resolve/resolved-gperf.gperf CONFLICT (add/add): Merge conflict in src/resolve/resolved-gperf.gperf Auto-merging src/resolve/resolved-etc-hosts.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-etc-hosts.h Auto-merging src/resolve/resolved-etc-hosts.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-etc-hosts.c Auto-merging src/resolve/resolved-dnstls.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls.h Auto-merging src/resolve/resolved-dnstls-openssl.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls-openssl.h Auto-merging src/resolve/resolved-dnstls-openssl.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls-openssl.c Auto-merging src/resolve/resolved-dnstls-gnutls.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls-gnutls.h Auto-merging src/resolve/resolved-dnstls-gnutls.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnstls-gnutls.c Auto-merging src/resolve/resolved-dnssd.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnssd.h Auto-merging src/resolve/resolved-dnssd.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnssd.c Auto-merging src/resolve/resolved-dnssd-bus.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnssd-bus.h Auto-merging src/resolve/resolved-dnssd-bus.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dnssd-bus.c Auto-merging src/resolve/resolved-dns-zone.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-zone.h Auto-merging src/resolve/resolved-dns-zone.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-zone.c Auto-merging src/resolve/resolved-dns-trust-anchor.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-trust-anchor.h Auto-merging src/resolve/resolved-dns-trust-anchor.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-trust-anchor.c Auto-merging src/resolve/resolved-dns-transaction.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-transaction.h Auto-merging src/resolve/resolved-dns-transaction.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-transaction.c Auto-merging src/resolve/resolved-dns-synthesize.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-synthesize.h Auto-merging src/resolve/resolved-dns-synthesize.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-synthesize.c Auto-merging src/resolve/resolved-dns-stub.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-stub.h Auto-merging src/resolve/resolved-dns-stub.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-stub.c Auto-merging src/resolve/resolved-dns-stream.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-stream.h Auto-merging src/resolve/resolved-dns-stream.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-stream.c Auto-merging src/resolve/resolved-dns-server.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-server.h Auto-merging src/resolve/resolved-dns-server.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-server.c Auto-merging src/resolve/resolved-dns-search-domain.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-search-domain.h Auto-merging src/resolve/resolved-dns-search-domain.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-search-domain.c Auto-merging src/resolve/resolved-dns-scope.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-scope.h Auto-merging src/resolve/resolved-dns-scope.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-scope.c Auto-merging src/resolve/resolved-dns-rr.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-rr.h Auto-merging src/resolve/resolved-dns-rr.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-rr.c Auto-merging src/resolve/resolved-dns-question.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-question.h Auto-merging src/resolve/resolved-dns-question.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-question.c Auto-merging src/resolve/resolved-dns-query.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-query.h Auto-merging src/resolve/resolved-dns-query.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-query.c Auto-merging src/resolve/resolved-dns-packet.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-packet.h Auto-merging src/resolve/resolved-dns-packet.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-packet.c Auto-merging src/resolve/resolved-dns-dnssec.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-dnssec.h Auto-merging src/resolve/resolved-dns-dnssec.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-dnssec.c Auto-merging src/resolve/resolved-dns-cache.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-cache.h Auto-merging src/resolve/resolved-dns-cache.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-cache.c Auto-merging src/resolve/resolved-dns-answer.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-answer.h Auto-merging src/resolve/resolved-dns-answer.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-dns-answer.c Auto-merging src/resolve/resolved-def.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-def.h Auto-merging src/resolve/resolved-conf.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-conf.h Auto-merging src/resolve/resolved-conf.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-conf.c Auto-merging src/resolve/resolved-bus.h CONFLICT (add/add): Merge conflict in src/resolve/resolved-bus.h Auto-merging src/resolve/resolved-bus.c CONFLICT (add/add): Merge conflict in src/resolve/resolved-bus.c Auto-merging src/resolve/resolvectl.h CONFLICT (add/add): Merge conflict in src/resolve/resolvectl.h Auto-merging src/resolve/resolvectl.c CONFLICT (add/add): Merge conflict in src/resolve/resolvectl.c Auto-merging src/resolve/resolvconf-compat.h CONFLICT (add/add): Merge conflict in src/resolve/resolvconf-compat.h Auto-merging src/resolve/resolvconf-compat.c CONFLICT (add/add): Merge conflict in src/resolve/resolvconf-compat.c Auto-merging src/resolve/resolv.conf CONFLICT (add/add): Merge conflict in src/resolve/resolv.conf Auto-merging src/resolve/org.freedesktop.resolve1.service CONFLICT (add/add): Merge conflict in src/resolve/org.freedesktop.resolve1.service Auto-merging src/resolve/org.freedesktop.resolve1.policy CONFLICT (add/add): Merge conflict in src/resolve/org.freedesktop.resolve1.policy Auto-merging src/resolve/meson.build CONFLICT (add/add): Merge conflict in src/resolve/meson.build Auto-merging src/resolve/dns-type.h CONFLICT (add/add): Merge conflict in src/resolve/dns-type.h Auto-merging src/resolve/dns-type.c CONFLICT (add/add): Merge conflict in src/resolve/dns-type.c Auto-merging src/reply-password/reply-password.c CONFLICT (add/add): Merge conflict in src/reply-password/reply-password.c Auto-merging src/remount-fs/remount-fs.c CONFLICT (add/add): Merge conflict in src/remount-fs/remount-fs.c Auto-merging src/rc-local-generator/rc-local-generator.c CONFLICT (add/add): Merge conflict in src/rc-local-generator/rc-local-generator.c Auto-merging src/random-seed/random-seed.c CONFLICT (add/add): Merge conflict in src/random-seed/random-seed.c Auto-merging src/quotacheck/quotacheck.c CONFLICT (add/add): Merge conflict in src/quotacheck/quotacheck.c Auto-merging src/pstore/pstore.c CONFLICT (add/add): Merge conflict in src/pstore/pstore.c Auto-merging src/pstore/meson.build CONFLICT (add/add): Merge conflict in src/pstore/meson.build Auto-merging src/portable/portabled.h CONFLICT (add/add): Merge conflict in src/portable/portabled.h Auto-merging src/portable/portabled.c CONFLICT (add/add): Merge conflict in src/portable/portabled.c Auto-merging src/portable/portabled-operation.h CONFLICT (add/add): Merge conflict in src/portable/portabled-operation.h Auto-merging src/portable/portabled-operation.c CONFLICT (add/add): Merge conflict in src/portable/portabled-operation.c Auto-merging src/portable/portabled-image.h CONFLICT (add/add): Merge conflict in src/portable/portabled-image.h Auto-merging src/portable/portabled-image.c CONFLICT (add/add): Merge conflict in src/portable/portabled-image.c Auto-merging src/portable/portabled-image-bus.h CONFLICT (add/add): Merge conflict in src/portable/portabled-image-bus.h Auto-merging src/portable/portabled-image-bus.c CONFLICT (add/add): Merge conflict in src/portable/portabled-image-bus.c Auto-merging src/portable/portabled-bus.h CONFLICT (add/add): Merge conflict in src/portable/portabled-bus.h Auto-merging src/portable/portabled-bus.c CONFLICT (add/add): Merge conflict in src/portable/portabled-bus.c Auto-merging src/portable/portablectl.c CONFLICT (add/add): Merge conflict in src/portable/portablectl.c Auto-merging src/portable/portable.h CONFLICT (add/add): Merge conflict in src/portable/portable.h Auto-merging src/portable/portable.c CONFLICT (add/add): Merge conflict in src/portable/portable.c Auto-merging src/portable/org.freedesktop.portable1.service CONFLICT (add/add): Merge conflict in src/portable/org.freedesktop.portable1.service Auto-merging src/portable/org.freedesktop.portable1.policy CONFLICT (add/add): Merge conflict in src/portable/org.freedesktop.portable1.policy Auto-merging src/portable/org.freedesktop.portable1.conf CONFLICT (add/add): Merge conflict in src/portable/org.freedesktop.portable1.conf Auto-merging src/portable/meson.build CONFLICT (add/add): Merge conflict in src/portable/meson.build Auto-merging src/path/path.c CONFLICT (add/add): Merge conflict in src/path/path.c Auto-merging src/partition/test-repart.sh CONFLICT (add/add): Merge conflict in src/partition/test-repart.sh Auto-merging src/partition/repart.c CONFLICT (add/add): Merge conflict in src/partition/repart.c Auto-merging src/partition/meson.build CONFLICT (add/add): Merge conflict in src/partition/meson.build Auto-merging src/partition/makefs.c CONFLICT (add/add): Merge conflict in src/partition/makefs.c Auto-merging src/partition/growfs.c CONFLICT (add/add): Merge conflict in src/partition/growfs.c Auto-merging src/nss-systemd/userdb-glue.h CONFLICT (add/add): Merge conflict in src/nss-systemd/userdb-glue.h Auto-merging src/nss-systemd/userdb-glue.c CONFLICT (add/add): Merge conflict in src/nss-systemd/userdb-glue.c Auto-merging src/nss-systemd/nss-systemd.sym CONFLICT (add/add): Merge conflict in src/nss-systemd/nss-systemd.sym Auto-merging src/nss-systemd/nss-systemd.c CONFLICT (add/add): Merge conflict in src/nss-systemd/nss-systemd.c Auto-merging src/nss-resolve/nss-resolve.sym CONFLICT (add/add): Merge conflict in src/nss-resolve/nss-resolve.sym Auto-merging src/nss-resolve/nss-resolve.c CONFLICT (add/add): Merge conflict in src/nss-resolve/nss-resolve.c Auto-merging src/nss-mymachines/nss-mymachines.sym CONFLICT (add/add): Merge conflict in src/nss-mymachines/nss-mymachines.sym Auto-merging src/nss-mymachines/nss-mymachines.c CONFLICT (add/add): Merge conflict in src/nss-mymachines/nss-mymachines.c Auto-merging src/nss-myhostname/nss-myhostname.sym CONFLICT (add/add): Merge conflict in src/nss-myhostname/nss-myhostname.sym Auto-merging src/nss-myhostname/nss-myhostname.c CONFLICT (add/add): Merge conflict in src/nss-myhostname/nss-myhostname.c Auto-merging src/nspawn/test-patch-uid.c CONFLICT (add/add): Merge conflict in src/nspawn/test-patch-uid.c Auto-merging src/nspawn/test-nspawn-tables.c CONFLICT (add/add): Merge conflict in src/nspawn/test-nspawn-tables.c Auto-merging src/nspawn/nspawn.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn.c Auto-merging src/nspawn/nspawn-stub-pid1.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-stub-pid1.h Auto-merging src/nspawn/nspawn-stub-pid1.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-stub-pid1.c Auto-merging src/nspawn/nspawn-setuid.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-setuid.h Auto-merging src/nspawn/nspawn-setuid.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-setuid.c Auto-merging src/nspawn/nspawn-settings.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-settings.h Auto-merging src/nspawn/nspawn-settings.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-settings.c Auto-merging src/nspawn/nspawn-seccomp.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-seccomp.h Auto-merging src/nspawn/nspawn-seccomp.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-seccomp.c Auto-merging src/nspawn/nspawn-register.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-register.h Auto-merging src/nspawn/nspawn-register.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-register.c Auto-merging src/nspawn/nspawn-patch-uid.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-patch-uid.h Auto-merging src/nspawn/nspawn-patch-uid.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-patch-uid.c Auto-merging src/nspawn/nspawn-oci.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-oci.h Auto-merging src/nspawn/nspawn-oci.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-oci.c Auto-merging src/nspawn/nspawn-network.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-network.h Auto-merging src/nspawn/nspawn-network.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-network.c Auto-merging src/nspawn/nspawn-mount.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-mount.h Auto-merging src/nspawn/nspawn-mount.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-mount.c Auto-merging src/nspawn/nspawn-expose-ports.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-expose-ports.h Auto-merging src/nspawn/nspawn-expose-ports.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-expose-ports.c Auto-merging src/nspawn/nspawn-def.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-def.h Auto-merging src/nspawn/nspawn-cgroup.h CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-cgroup.h Auto-merging src/nspawn/nspawn-cgroup.c CONFLICT (add/add): Merge conflict in src/nspawn/nspawn-cgroup.c Auto-merging src/nspawn/meson.build CONFLICT (add/add): Merge conflict in src/nspawn/meson.build Auto-merging src/notify/notify.c CONFLICT (add/add): Merge conflict in src/notify/notify.c Auto-merging src/network/wait-online/wait-online.c CONFLICT (add/add): Merge conflict in src/network/wait-online/wait-online.c Auto-merging src/network/wait-online/manager.h CONFLICT (add/add): Merge conflict in src/network/wait-online/manager.h Auto-merging src/network/wait-online/manager.c CONFLICT (add/add): Merge conflict in src/network/wait-online/manager.c Auto-merging src/network/wait-online/link.h CONFLICT (add/add): Merge conflict in src/network/wait-online/link.h Auto-merging src/network/wait-online/link.c CONFLICT (add/add): Merge conflict in src/network/wait-online/link.c Auto-merging src/network/test-routing-policy-rule.c CONFLICT (add/add): Merge conflict in src/network/test-routing-policy-rule.c Auto-merging src/network/test-networkd-conf.c CONFLICT (add/add): Merge conflict in src/network/test-networkd-conf.c Auto-merging src/network/test-network.c CONFLICT (add/add): Merge conflict in src/network/test-network.c Auto-merging src/network/test-network-tables.c CONFLICT (add/add): Merge conflict in src/network/test-network-tables.c Auto-merging src/network/tc/teql.h CONFLICT (add/add): Merge conflict in src/network/tc/teql.h Auto-merging src/network/tc/teql.c CONFLICT (add/add): Merge conflict in src/network/tc/teql.c Auto-merging src/network/tc/tclass.h CONFLICT (add/add): Merge conflict in src/network/tc/tclass.h Auto-merging src/network/tc/tclass.c CONFLICT (add/add): Merge conflict in src/network/tc/tclass.c Auto-merging src/network/tc/tc.h CONFLICT (add/add): Merge conflict in src/network/tc/tc.h Auto-merging src/network/tc/tc.c CONFLICT (add/add): Merge conflict in src/network/tc/tc.c Auto-merging src/network/tc/tc-util.h CONFLICT (add/add): Merge conflict in src/network/tc/tc-util.h Auto-merging src/network/tc/tc-util.c CONFLICT (add/add): Merge conflict in src/network/tc/tc-util.c Auto-merging src/network/tc/tbf.h CONFLICT (add/add): Merge conflict in src/network/tc/tbf.h Auto-merging src/network/tc/tbf.c CONFLICT (add/add): Merge conflict in src/network/tc/tbf.c Auto-merging src/network/tc/sfq.h CONFLICT (add/add): Merge conflict in src/network/tc/sfq.h Auto-merging src/network/tc/sfq.c CONFLICT (add/add): Merge conflict in src/network/tc/sfq.c Auto-merging src/network/tc/sfb.h CONFLICT (add/add): Merge conflict in src/network/tc/sfb.h Auto-merging src/network/tc/sfb.c CONFLICT (add/add): Merge conflict in src/network/tc/sfb.c Auto-merging src/network/tc/qfq.h CONFLICT (add/add): Merge conflict in src/network/tc/qfq.h Auto-merging src/network/tc/qfq.c CONFLICT (add/add): Merge conflict in src/network/tc/qfq.c Auto-merging src/network/tc/qdisc.h CONFLICT (add/add): Merge conflict in src/network/tc/qdisc.h Auto-merging src/network/tc/qdisc.c CONFLICT (add/add): Merge conflict in src/network/tc/qdisc.c Auto-merging src/network/tc/pie.h CONFLICT (add/add): Merge conflict in src/network/tc/pie.h Auto-merging src/network/tc/pie.c CONFLICT (add/add): Merge conflict in src/network/tc/pie.c Auto-merging src/network/tc/netem.h CONFLICT (add/add): Merge conflict in src/network/tc/netem.h Auto-merging src/network/tc/netem.c CONFLICT (add/add): Merge conflict in src/network/tc/netem.c Auto-merging src/network/tc/htb.h CONFLICT (add/add): Merge conflict in src/network/tc/htb.h Auto-merging src/network/tc/htb.c CONFLICT (add/add): Merge conflict in src/network/tc/htb.c Auto-merging src/network/tc/hhf.h CONFLICT (add/add): Merge conflict in src/network/tc/hhf.h Auto-merging src/network/tc/hhf.c CONFLICT (add/add): Merge conflict in src/network/tc/hhf.c Auto-merging src/network/tc/gred.h CONFLICT (add/add): Merge conflict in src/network/tc/gred.h Auto-merging src/network/tc/gred.c CONFLICT (add/add): Merge conflict in src/network/tc/gred.c Auto-merging src/network/tc/fq.h CONFLICT (add/add): Merge conflict in src/network/tc/fq.h Auto-merging src/network/tc/fq.c CONFLICT (add/add): Merge conflict in src/network/tc/fq.c Auto-merging src/network/tc/fq-codel.h CONFLICT (add/add): Merge conflict in src/network/tc/fq-codel.h Auto-merging src/network/tc/fq-codel.c CONFLICT (add/add): Merge conflict in src/network/tc/fq-codel.c Auto-merging src/network/tc/fifo.h CONFLICT (add/add): Merge conflict in src/network/tc/fifo.h Auto-merging src/network/tc/fifo.c CONFLICT (add/add): Merge conflict in src/network/tc/fifo.c Auto-merging src/network/tc/drr.h CONFLICT (add/add): Merge conflict in src/network/tc/drr.h Auto-merging src/network/tc/drr.c CONFLICT (add/add): Merge conflict in src/network/tc/drr.c Auto-merging src/network/tc/codel.h CONFLICT (add/add): Merge conflict in src/network/tc/codel.h Auto-merging src/network/tc/codel.c CONFLICT (add/add): Merge conflict in src/network/tc/codel.c Auto-merging src/network/tc/cake.h CONFLICT (add/add): Merge conflict in src/network/tc/cake.h Auto-merging src/network/tc/cake.c CONFLICT (add/add): Merge conflict in src/network/tc/cake.c Auto-merging src/network/org.freedesktop.network1.service CONFLICT (add/add): Merge conflict in src/network/org.freedesktop.network1.service Auto-merging src/network/org.freedesktop.network1.policy CONFLICT (add/add): Merge conflict in src/network/org.freedesktop.network1.policy Auto-merging src/network/networkd.c CONFLICT (add/add): Merge conflict in src/network/networkd.c Auto-merging src/network/networkd-wifi.h CONFLICT (add/add): Merge conflict in src/network/networkd-wifi.h Auto-merging src/network/networkd-wifi.c CONFLICT (add/add): Merge conflict in src/network/networkd-wifi.c Auto-merging src/network/networkd-util.h CONFLICT (add/add): Merge conflict in src/network/networkd-util.h Auto-merging src/network/networkd-util.c CONFLICT (add/add): Merge conflict in src/network/networkd-util.c Auto-merging src/network/networkd-speed-meter.h CONFLICT (add/add): Merge conflict in src/network/networkd-speed-meter.h Auto-merging src/network/networkd-speed-meter.c CONFLICT (add/add): Merge conflict in src/network/networkd-speed-meter.c Auto-merging src/network/networkd-routing-policy-rule.h CONFLICT (add/add): Merge conflict in src/network/networkd-routing-policy-rule.h Auto-merging src/network/networkd-routing-policy-rule.c CONFLICT (add/add): Merge conflict in src/network/networkd-routing-policy-rule.c Auto-merging src/network/networkd-route.h CONFLICT (add/add): Merge conflict in src/network/networkd-route.h Auto-merging src/network/networkd-route.c CONFLICT (add/add): Merge conflict in src/network/networkd-route.c Auto-merging src/network/networkd-radv.h CONFLICT (add/add): Merge conflict in src/network/networkd-radv.h Auto-merging src/network/networkd-radv.c CONFLICT (add/add): Merge conflict in src/network/networkd-radv.c Auto-merging src/network/networkd-nexthop.h CONFLICT (add/add): Merge conflict in src/network/networkd-nexthop.h Auto-merging src/network/networkd-nexthop.c CONFLICT (add/add): Merge conflict in src/network/networkd-nexthop.c Auto-merging src/network/networkd-network.h CONFLICT (add/add): Merge conflict in src/network/networkd-network.h Auto-merging src/network/networkd-network.c CONFLICT (add/add): Merge conflict in src/network/networkd-network.c Auto-merging src/network/networkd-network-gperf.gperf CONFLICT (add/add): Merge conflict in src/network/networkd-network-gperf.gperf Auto-merging src/network/networkd-network-bus.h CONFLICT (add/add): Merge conflict in src/network/networkd-network-bus.h Auto-merging src/network/networkd-network-bus.c CONFLICT (add/add): Merge conflict in src/network/networkd-network-bus.c Auto-merging src/network/networkd-neighbor.h CONFLICT (add/add): Merge conflict in src/network/networkd-neighbor.h Auto-merging src/network/networkd-neighbor.c CONFLICT (add/add): Merge conflict in src/network/networkd-neighbor.c Auto-merging src/network/networkd-ndisc.h CONFLICT (add/add): Merge conflict in src/network/networkd-ndisc.h Auto-merging src/network/networkd-ndisc.c CONFLICT (add/add): Merge conflict in src/network/networkd-ndisc.c Auto-merging src/network/networkd-manager.h CONFLICT (add/add): Merge conflict in src/network/networkd-manager.h Auto-merging src/network/networkd-manager.c CONFLICT (add/add): Merge conflict in src/network/networkd-manager.c Auto-merging src/network/networkd-manager-bus.h CONFLICT (add/add): Merge conflict in src/network/networkd-manager-bus.h Auto-merging src/network/networkd-manager-bus.c CONFLICT (add/add): Merge conflict in src/network/networkd-manager-bus.c Auto-merging src/network/networkd-lldp-tx.h CONFLICT (add/add): Merge conflict in src/network/networkd-lldp-tx.h Auto-merging src/network/networkd-lldp-tx.c CONFLICT (add/add): Merge conflict in src/network/networkd-lldp-tx.c Auto-merging src/network/networkd-lldp-rx.h CONFLICT (add/add): Merge conflict in src/network/networkd-lldp-rx.h Auto-merging src/network/networkd-lldp-rx.c CONFLICT (add/add): Merge conflict in src/network/networkd-lldp-rx.c Auto-merging src/network/networkd-link.h CONFLICT (add/add): Merge conflict in src/network/networkd-link.h Auto-merging src/network/networkd-link.c CONFLICT (add/add): Merge conflict in src/network/networkd-link.c Auto-merging src/network/networkd-link-bus.h CONFLICT (add/add): Merge conflict in src/network/networkd-link-bus.h Auto-merging src/network/networkd-link-bus.c CONFLICT (add/add): Merge conflict in src/network/networkd-link-bus.c Auto-merging src/network/networkd-ipv6-proxy-ndp.h CONFLICT (add/add): Merge conflict in src/network/networkd-ipv6-proxy-ndp.h Auto-merging src/network/networkd-ipv6-proxy-ndp.c CONFLICT (add/add): Merge conflict in src/network/networkd-ipv6-proxy-ndp.c Auto-merging src/network/networkd-ipv4ll.h CONFLICT (add/add): Merge conflict in src/network/networkd-ipv4ll.h Auto-merging src/network/networkd-ipv4ll.c CONFLICT (add/add): Merge conflict in src/network/networkd-ipv4ll.c Auto-merging src/network/networkd-fdb.h CONFLICT (add/add): Merge conflict in src/network/networkd-fdb.h Auto-merging src/network/networkd-fdb.c CONFLICT (add/add): Merge conflict in src/network/networkd-fdb.c Auto-merging src/network/networkd-dhcp6.h CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp6.h Auto-merging src/network/networkd-dhcp6.c CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp6.c Auto-merging src/network/networkd-dhcp4.h CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp4.h Auto-merging src/network/networkd-dhcp4.c CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp4.c Auto-merging src/network/networkd-dhcp-server.h CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp-server.h Auto-merging src/network/networkd-dhcp-server.c CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp-server.c Auto-merging src/network/networkd-dhcp-common.h CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp-common.h Auto-merging src/network/networkd-dhcp-common.c CONFLICT (add/add): Merge conflict in src/network/networkd-dhcp-common.c Auto-merging src/network/networkd-conf.h CONFLICT (add/add): Merge conflict in src/network/networkd-conf.h Auto-merging src/network/networkd-conf.c CONFLICT (add/add): Merge conflict in src/network/networkd-conf.c Auto-merging src/network/networkd-can.h CONFLICT (add/add): Merge conflict in src/network/networkd-can.h Auto-merging src/network/networkd-can.c CONFLICT (add/add): Merge conflict in src/network/networkd-can.c Auto-merging src/network/networkd-brvlan.h CONFLICT (add/add): Merge conflict in src/network/networkd-brvlan.h Auto-merging src/network/networkd-brvlan.c CONFLICT (add/add): Merge conflict in src/network/networkd-brvlan.c Auto-merging src/network/networkd-address.h CONFLICT (add/add): Merge conflict in src/network/networkd-address.h Auto-merging src/network/networkd-address.c CONFLICT (add/add): Merge conflict in src/network/networkd-address.c Auto-merging src/network/networkd-address-pool.h CONFLICT (add/add): Merge conflict in src/network/networkd-address-pool.h Auto-merging src/network/networkd-address-pool.c CONFLICT (add/add): Merge conflict in src/network/networkd-address-pool.c Auto-merging src/network/networkd-address-label.h CONFLICT (add/add): Merge conflict in src/network/networkd-address-label.h Auto-merging src/network/networkd-address-label.c CONFLICT (add/add): Merge conflict in src/network/networkd-address-label.c Auto-merging src/network/networkctl.c CONFLICT (add/add): Merge conflict in src/network/networkctl.c Auto-merging src/network/netdev/xfrm.h CONFLICT (add/add): Merge conflict in src/network/netdev/xfrm.h Auto-merging src/network/netdev/xfrm.c CONFLICT (add/add): Merge conflict in src/network/netdev/xfrm.c Auto-merging src/network/netdev/wireguard.h CONFLICT (add/add): Merge conflict in src/network/netdev/wireguard.h Auto-merging src/network/netdev/wireguard.c CONFLICT (add/add): Merge conflict in src/network/netdev/wireguard.c Auto-merging src/network/netdev/vxlan.h CONFLICT (add/add): Merge conflict in src/network/netdev/vxlan.h Auto-merging src/network/netdev/vxlan.c CONFLICT (add/add): Merge conflict in src/network/netdev/vxlan.c Auto-merging src/network/netdev/vxcan.h CONFLICT (add/add): Merge conflict in src/network/netdev/vxcan.h Auto-merging src/network/netdev/vxcan.c CONFLICT (add/add): Merge conflict in src/network/netdev/vxcan.c Auto-merging src/network/netdev/vrf.h CONFLICT (add/add): Merge conflict in src/network/netdev/vrf.h Auto-merging src/network/netdev/vrf.c CONFLICT (add/add): Merge conflict in src/network/netdev/vrf.c Auto-merging src/network/netdev/vlan.h CONFLICT (add/add): Merge conflict in src/network/netdev/vlan.h Auto-merging src/network/netdev/vlan.c CONFLICT (add/add): Merge conflict in src/network/netdev/vlan.c Auto-merging src/network/netdev/veth.h CONFLICT (add/add): Merge conflict in src/network/netdev/veth.h Auto-merging src/network/netdev/veth.c CONFLICT (add/add): Merge conflict in src/network/netdev/veth.c Auto-merging src/network/netdev/vcan.h CONFLICT (add/add): Merge conflict in src/network/netdev/vcan.h Auto-merging src/network/netdev/vcan.c CONFLICT (add/add): Merge conflict in src/network/netdev/vcan.c Auto-merging src/network/netdev/tuntap.h CONFLICT (add/add): Merge conflict in src/network/netdev/tuntap.h Auto-merging src/network/netdev/tuntap.c CONFLICT (add/add): Merge conflict in src/network/netdev/tuntap.c Auto-merging src/network/netdev/tunnel.h CONFLICT (add/add): Merge conflict in src/network/netdev/tunnel.h Auto-merging src/network/netdev/tunnel.c CONFLICT (add/add): Merge conflict in src/network/netdev/tunnel.c Auto-merging src/network/netdev/nlmon.h CONFLICT (add/add): Merge conflict in src/network/netdev/nlmon.h Auto-merging src/network/netdev/nlmon.c CONFLICT (add/add): Merge conflict in src/network/netdev/nlmon.c Auto-merging src/network/netdev/netdevsim.h CONFLICT (add/add): Merge conflict in src/network/netdev/netdevsim.h Auto-merging src/network/netdev/netdevsim.c CONFLICT (add/add): Merge conflict in src/network/netdev/netdevsim.c Auto-merging src/network/netdev/netdev.h CONFLICT (add/add): Merge conflict in src/network/netdev/netdev.h Auto-merging src/network/netdev/netdev.c CONFLICT (add/add): Merge conflict in src/network/netdev/netdev.c Auto-merging src/network/netdev/netdev-gperf.gperf CONFLICT (add/add): Merge conflict in src/network/netdev/netdev-gperf.gperf Auto-merging src/network/netdev/macvlan.h CONFLICT (add/add): Merge conflict in src/network/netdev/macvlan.h Auto-merging src/network/netdev/macvlan.c CONFLICT (add/add): Merge conflict in src/network/netdev/macvlan.c Auto-merging src/network/netdev/macsec.h CONFLICT (add/add): Merge conflict in src/network/netdev/macsec.h Auto-merging src/network/netdev/macsec.c CONFLICT (add/add): Merge conflict in src/network/netdev/macsec.c Auto-merging src/network/netdev/l2tp-tunnel.h CONFLICT (add/add): Merge conflict in src/network/netdev/l2tp-tunnel.h Auto-merging src/network/netdev/l2tp-tunnel.c CONFLICT (add/add): Merge conflict in src/network/netdev/l2tp-tunnel.c Auto-merging src/network/netdev/ipvlan.h CONFLICT (add/add): Merge conflict in src/network/netdev/ipvlan.h Auto-merging src/network/netdev/ipvlan.c CONFLICT (add/add): Merge conflict in src/network/netdev/ipvlan.c Auto-merging src/network/netdev/ifb.h CONFLICT (add/add): Merge conflict in src/network/netdev/ifb.h Auto-merging src/network/netdev/ifb.c CONFLICT (add/add): Merge conflict in src/network/netdev/ifb.c Auto-merging src/network/netdev/geneve.h CONFLICT (add/add): Merge conflict in src/network/netdev/geneve.h Auto-merging src/network/netdev/geneve.c CONFLICT (add/add): Merge conflict in src/network/netdev/geneve.c Auto-merging src/network/netdev/fou-tunnel.h CONFLICT (add/add): Merge conflict in src/network/netdev/fou-tunnel.h Auto-merging src/network/netdev/fou-tunnel.c CONFLICT (add/add): Merge conflict in src/network/netdev/fou-tunnel.c Auto-merging src/network/netdev/dummy.h CONFLICT (add/add): Merge conflict in src/network/netdev/dummy.h Auto-merging src/network/netdev/dummy.c CONFLICT (add/add): Merge conflict in src/network/netdev/dummy.c Auto-merging src/network/netdev/bridge.h CONFLICT (add/add): Merge conflict in src/network/netdev/bridge.h Auto-merging src/network/netdev/bridge.c CONFLICT (add/add): Merge conflict in src/network/netdev/bridge.c Auto-merging src/network/netdev/bond.h CONFLICT (add/add): Merge conflict in src/network/netdev/bond.h Auto-merging src/network/netdev/bond.c CONFLICT (add/add): Merge conflict in src/network/netdev/bond.c Auto-merging src/network/meson.build CONFLICT (add/add): Merge conflict in src/network/meson.build Auto-merging src/network/generator/test-network-generator.c CONFLICT (add/add): Merge conflict in src/network/generator/test-network-generator.c Auto-merging src/network/generator/network-generator.h CONFLICT (add/add): Merge conflict in src/network/generator/network-generator.h Auto-merging src/network/generator/network-generator.c CONFLICT (add/add): Merge conflict in src/network/generator/network-generator.c Auto-merging src/network/generator/main.c CONFLICT (add/add): Merge conflict in src/network/generator/main.c Auto-merging src/network/fuzz-network-parser.c CONFLICT (add/add): Merge conflict in src/network/fuzz-network-parser.c Auto-merging src/network/fuzz-netdev-parser.c CONFLICT (add/add): Merge conflict in src/network/fuzz-netdev-parser.c Auto-merging src/mount/mount-tool.c CONFLICT (add/add): Merge conflict in src/mount/mount-tool.c Auto-merging src/modules-load/modules-load.c CONFLICT (add/add): Merge conflict in src/modules-load/modules-load.c Auto-merging src/machine/test-machine-tables.c CONFLICT (add/add): Merge conflict in src/machine/test-machine-tables.c Auto-merging src/machine/org.freedesktop.machine1.service CONFLICT (add/add): Merge conflict in src/machine/org.freedesktop.machine1.service Auto-merging src/machine/org.freedesktop.machine1.policy CONFLICT (add/add): Merge conflict in src/machine/org.freedesktop.machine1.policy Auto-merging src/machine/operation.h CONFLICT (add/add): Merge conflict in src/machine/operation.h Auto-merging src/machine/operation.c CONFLICT (add/add): Merge conflict in src/machine/operation.c Auto-merging src/machine/meson.build CONFLICT (add/add): Merge conflict in src/machine/meson.build Auto-merging src/machine/machined.h CONFLICT (add/add): Merge conflict in src/machine/machined.h Auto-merging src/machine/machined.c CONFLICT (add/add): Merge conflict in src/machine/machined.c Auto-merging src/machine/machined-dbus.c CONFLICT (add/add): Merge conflict in src/machine/machined-dbus.c Auto-merging src/machine/machined-core.c CONFLICT (add/add): Merge conflict in src/machine/machined-core.c Auto-merging src/machine/machinectl.c CONFLICT (add/add): Merge conflict in src/machine/machinectl.c Auto-merging src/machine/machine.h CONFLICT (add/add): Merge conflict in src/machine/machine.h Auto-merging src/machine/machine.c CONFLICT (add/add): Merge conflict in src/machine/machine.c Auto-merging src/machine/machine-dbus.h CONFLICT (add/add): Merge conflict in src/machine/machine-dbus.h Auto-merging src/machine/machine-dbus.c CONFLICT (add/add): Merge conflict in src/machine/machine-dbus.c Auto-merging src/machine/image-dbus.h CONFLICT (add/add): Merge conflict in src/machine/image-dbus.h Auto-merging src/machine/image-dbus.c CONFLICT (add/add): Merge conflict in src/machine/image-dbus.c Auto-merging src/machine-id-setup/machine-id-setup-main.c CONFLICT (add/add): Merge conflict in src/machine-id-setup/machine-id-setup-main.c Auto-merging src/login/user-runtime-dir.c CONFLICT (add/add): Merge conflict in src/login/user-runtime-dir.c Auto-merging src/login/test-login-tables.c CONFLICT (add/add): Merge conflict in src/login/test-login-tables.c Auto-merging src/login/test-login-shared.c CONFLICT (add/add): Merge conflict in src/login/test-login-shared.c Auto-merging src/login/test-inhibit.c CONFLICT (add/add): Merge conflict in src/login/test-inhibit.c Auto-merging src/login/sysfs-show.h CONFLICT (add/add): Merge conflict in src/login/sysfs-show.h Auto-merging src/login/sysfs-show.c CONFLICT (add/add): Merge conflict in src/login/sysfs-show.c Auto-merging src/login/pam_systemd.sym CONFLICT (add/add): Merge conflict in src/login/pam_systemd.sym Auto-merging src/login/pam_systemd.c CONFLICT (add/add): Merge conflict in src/login/pam_systemd.c Auto-merging src/login/org.freedesktop.login1.service CONFLICT (add/add): Merge conflict in src/login/org.freedesktop.login1.service Auto-merging src/login/org.freedesktop.login1.policy CONFLICT (add/add): Merge conflict in src/login/org.freedesktop.login1.policy Auto-merging src/login/org.freedesktop.login1.conf CONFLICT (add/add): Merge conflict in src/login/org.freedesktop.login1.conf Auto-merging src/login/meson.build CONFLICT (add/add): Merge conflict in src/login/meson.build Auto-merging src/login/logind.h CONFLICT (add/add): Merge conflict in src/login/logind.h Auto-merging src/login/logind.conf.in CONFLICT (add/add): Merge conflict in src/login/logind.conf.in Auto-merging src/login/logind.c CONFLICT (add/add): Merge conflict in src/login/logind.c Auto-merging src/login/logind-utmp.c CONFLICT (add/add): Merge conflict in src/login/logind-utmp.c Auto-merging src/login/logind-user.h CONFLICT (add/add): Merge conflict in src/login/logind-user.h Auto-merging src/login/logind-user.c CONFLICT (add/add): Merge conflict in src/login/logind-user.c Auto-merging src/login/logind-user-dbus.h CONFLICT (add/add): Merge conflict in src/login/logind-user-dbus.h Auto-merging src/login/logind-user-dbus.c CONFLICT (add/add): Merge conflict in src/login/logind-user-dbus.c Auto-merging src/login/logind-session.h CONFLICT (add/add): Merge conflict in src/login/logind-session.h Auto-merging src/login/logind-session.c CONFLICT (add/add): Merge conflict in src/login/logind-session.c Auto-merging src/login/logind-session-device.h CONFLICT (add/add): Merge conflict in src/login/logind-session-device.h Auto-merging src/login/logind-session-device.c CONFLICT (add/add): Merge conflict in src/login/logind-session-device.c Auto-merging src/login/logind-session-dbus.h CONFLICT (add/add): Merge conflict in src/login/logind-session-dbus.h Auto-merging src/login/logind-session-dbus.c CONFLICT (add/add): Merge conflict in src/login/logind-session-dbus.c Auto-merging src/login/logind-seat.h CONFLICT (add/add): Merge conflict in src/login/logind-seat.h Auto-merging src/login/logind-seat.c CONFLICT (add/add): Merge conflict in src/login/logind-seat.c Auto-merging src/login/logind-seat-dbus.h CONFLICT (add/add): Merge conflict in src/login/logind-seat-dbus.h Auto-merging src/login/logind-seat-dbus.c CONFLICT (add/add): Merge conflict in src/login/logind-seat-dbus.c Auto-merging src/login/logind-inhibit.h CONFLICT (add/add): Merge conflict in src/login/logind-inhibit.h Auto-merging src/login/logind-inhibit.c CONFLICT (add/add): Merge conflict in src/login/logind-inhibit.c Auto-merging src/login/logind-gperf.gperf CONFLICT (add/add): Merge conflict in src/login/logind-gperf.gperf Auto-merging src/login/logind-device.h CONFLICT (add/add): Merge conflict in src/login/logind-device.h Auto-merging src/login/logind-device.c CONFLICT (add/add): Merge conflict in src/login/logind-device.c Auto-merging src/login/logind-dbus.h CONFLICT (add/add): Merge conflict in src/login/logind-dbus.h Auto-merging src/login/logind-dbus.c CONFLICT (add/add): Merge conflict in src/login/logind-dbus.c Auto-merging src/login/logind-core.c CONFLICT (add/add): Merge conflict in src/login/logind-core.c Auto-merging src/login/logind-button.h CONFLICT (add/add): Merge conflict in src/login/logind-button.h Auto-merging src/login/logind-button.c CONFLICT (add/add): Merge conflict in src/login/logind-button.c Auto-merging src/login/logind-brightness.h CONFLICT (add/add): Merge conflict in src/login/logind-brightness.h Auto-merging src/login/logind-brightness.c CONFLICT (add/add): Merge conflict in src/login/logind-brightness.c Auto-merging src/login/logind-action.h CONFLICT (add/add): Merge conflict in src/login/logind-action.h Auto-merging src/login/logind-action.c CONFLICT (add/add): Merge conflict in src/login/logind-action.c Auto-merging src/login/logind-acl.h CONFLICT (add/add): Merge conflict in src/login/logind-acl.h Auto-merging src/login/logind-acl.c CONFLICT (add/add): Merge conflict in src/login/logind-acl.c Auto-merging src/login/loginctl.c CONFLICT (add/add): Merge conflict in src/login/loginctl.c Auto-merging src/login/inhibit.c CONFLICT (add/add): Merge conflict in src/login/inhibit.c Auto-merging src/login/73-seat-late.rules.m4 CONFLICT (add/add): Merge conflict in src/login/73-seat-late.rules.m4 Auto-merging src/login/71-seat.rules.in CONFLICT (add/add): Merge conflict in src/login/71-seat.rules.in Auto-merging src/login/70-uaccess.rules.m4 CONFLICT (add/add): Merge conflict in src/login/70-uaccess.rules.m4 Auto-merging src/login/70-power-switch.rules CONFLICT (add/add): Merge conflict in src/login/70-power-switch.rules Auto-merging src/locale/test-keymap-util.c CONFLICT (add/add): Merge conflict in src/locale/test-keymap-util.c Auto-merging src/locale/org.freedesktop.locale1.service CONFLICT (add/add): Merge conflict in src/locale/org.freedesktop.locale1.service Auto-merging src/locale/org.freedesktop.locale1.policy CONFLICT (add/add): Merge conflict in src/locale/org.freedesktop.locale1.policy Auto-merging src/locale/org.freedesktop.locale1.conf CONFLICT (add/add): Merge conflict in src/locale/org.freedesktop.locale1.conf Auto-merging src/locale/meson.build CONFLICT (add/add): Merge conflict in src/locale/meson.build Auto-merging src/locale/localed.c CONFLICT (add/add): Merge conflict in src/locale/localed.c Auto-merging src/locale/localectl.c CONFLICT (add/add): Merge conflict in src/locale/localectl.c Auto-merging src/locale/keymap-util.h CONFLICT (add/add): Merge conflict in src/locale/keymap-util.h Auto-merging src/locale/keymap-util.c CONFLICT (add/add): Merge conflict in src/locale/keymap-util.c Auto-merging src/libudev/meson.build CONFLICT (add/add): Merge conflict in src/libudev/meson.build Auto-merging src/libudev/libudev.sym CONFLICT (add/add): Merge conflict in src/libudev/libudev.sym Auto-merging src/libudev/libudev.pc.in CONFLICT (add/add): Merge conflict in src/libudev/libudev.pc.in Auto-merging src/libudev/libudev.h CONFLICT (add/add): Merge conflict in src/libudev/libudev.h Auto-merging src/libudev/libudev.c CONFLICT (add/add): Merge conflict in src/libudev/libudev.c Auto-merging src/libudev/libudev-util.h CONFLICT (add/add): Merge conflict in src/libudev/libudev-util.h Auto-merging src/libudev/libudev-util.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-util.c Auto-merging src/libudev/libudev-queue.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-queue.c Auto-merging src/libudev/libudev-monitor.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-monitor.c Auto-merging src/libudev/libudev-list.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-list.c Auto-merging src/libudev/libudev-list-internal.h CONFLICT (add/add): Merge conflict in src/libudev/libudev-list-internal.h Auto-merging src/libudev/libudev-hwdb.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-hwdb.c Auto-merging src/libudev/libudev-enumerate.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-enumerate.c Auto-merging src/libudev/libudev-device.c CONFLICT (add/add): Merge conflict in src/libudev/libudev-device.c Auto-merging src/libudev/libudev-device-internal.h CONFLICT (add/add): Merge conflict in src/libudev/libudev-device-internal.h Auto-merging src/libsystemd/sd-utf8/sd-utf8.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-utf8/sd-utf8.c Auto-merging src/libsystemd/sd-resolve/test-resolve.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-resolve/test-resolve.c Auto-merging src/libsystemd/sd-resolve/sd-resolve.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-resolve/sd-resolve.c Auto-merging src/libsystemd/sd-resolve/resolve-private.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-resolve/resolve-private.h Auto-merging src/libsystemd/sd-path/sd-path.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-path/sd-path.c Auto-merging src/libsystemd/sd-network/sd-network.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-network/sd-network.c Auto-merging src/libsystemd/sd-network/network-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-network/network-util.h Auto-merging src/libsystemd/sd-network/network-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-network/network-util.c Auto-merging src/libsystemd/sd-netlink/test-netlink.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/test-netlink.c Auto-merging src/libsystemd/sd-netlink/sd-netlink.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/sd-netlink.c Auto-merging src/libsystemd/sd-netlink/rtnl-message.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/rtnl-message.c Auto-merging src/libsystemd/sd-netlink/netlink-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-util.h Auto-merging src/libsystemd/sd-netlink/netlink-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-util.c Auto-merging src/libsystemd/sd-netlink/netlink-types.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-types.h Auto-merging src/libsystemd/sd-netlink/netlink-types.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-types.c Auto-merging src/libsystemd/sd-netlink/netlink-socket.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-socket.c Auto-merging src/libsystemd/sd-netlink/netlink-slot.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-slot.h Auto-merging src/libsystemd/sd-netlink/netlink-slot.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-slot.c Auto-merging src/libsystemd/sd-netlink/netlink-message.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-message.c Auto-merging src/libsystemd/sd-netlink/netlink-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/netlink-internal.h Auto-merging src/libsystemd/sd-netlink/generic-netlink.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/generic-netlink.h Auto-merging src/libsystemd/sd-netlink/generic-netlink.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-netlink/generic-netlink.c Auto-merging src/libsystemd/sd-login/test-login.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-login/test-login.c Auto-merging src/libsystemd/sd-login/sd-login.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-login/sd-login.c Auto-merging src/libsystemd/sd-id128/sd-id128.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-id128/sd-id128.c Auto-merging src/libsystemd/sd-id128/id128-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-id128/id128-util.h Auto-merging src/libsystemd/sd-id128/id128-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-id128/id128-util.c Auto-merging src/libsystemd/sd-hwdb/sd-hwdb.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-hwdb/sd-hwdb.c Auto-merging src/libsystemd/sd-hwdb/hwdb-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-hwdb/hwdb-util.h Auto-merging src/libsystemd/sd-hwdb/hwdb-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-hwdb/hwdb-util.c Auto-merging src/libsystemd/sd-hwdb/hwdb-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-hwdb/hwdb-internal.h Auto-merging src/libsystemd/sd-event/test-event.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/test-event.c Auto-merging src/libsystemd/sd-event/sd-event.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/sd-event.c Auto-merging src/libsystemd/sd-event/event-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/event-util.h Auto-merging src/libsystemd/sd-event/event-util.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/event-util.c Auto-merging src/libsystemd/sd-event/event-source.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-event/event-source.h Auto-merging src/libsystemd/sd-device/test-udev-device-thread.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/test-udev-device-thread.c Auto-merging src/libsystemd/sd-device/test-sd-device.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/test-sd-device.c Auto-merging src/libsystemd/sd-device/test-sd-device-thread.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/test-sd-device-thread.c Auto-merging src/libsystemd/sd-device/test-sd-device-monitor.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/test-sd-device-monitor.c Auto-merging src/libsystemd/sd-device/sd-device.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/sd-device.c Auto-merging src/libsystemd/sd-device/device-util.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-util.h Auto-merging src/libsystemd/sd-device/device-private.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-private.h Auto-merging src/libsystemd/sd-device/device-private.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-private.c Auto-merging src/libsystemd/sd-device/device-monitor.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-monitor.c Auto-merging src/libsystemd/sd-device/device-monitor-private.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-monitor-private.h Auto-merging src/libsystemd/sd-device/device-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-internal.h Auto-merging src/libsystemd/sd-device/device-enumerator.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-enumerator.c Auto-merging src/libsystemd/sd-device/device-enumerator-private.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-device/device-enumerator-private.h Auto-merging src/libsystemd/sd-daemon/sd-daemon.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-daemon/sd-daemon.c Auto-merging src/libsystemd/sd-bus/test-vtable-data.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-vtable-data.h Auto-merging src/libsystemd/sd-bus/test-bus-watch-bind.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-watch-bind.c Auto-merging src/libsystemd/sd-bus/test-bus-vtable.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-vtable.c Auto-merging src/libsystemd/sd-bus/test-bus-track.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-track.c Auto-merging src/libsystemd/sd-bus/test-bus-signature.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-signature.c Auto-merging src/libsystemd/sd-bus/test-bus-server.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-server.c Auto-merging src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c Auto-merging src/libsystemd/sd-bus/test-bus-objects.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-objects.c Auto-merging src/libsystemd/sd-bus/test-bus-match.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-match.c Auto-merging src/libsystemd/sd-bus/test-bus-marshal.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-marshal.c Auto-merging src/libsystemd/sd-bus/test-bus-introspect.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-introspect.c Auto-merging src/libsystemd/sd-bus/test-bus-gvariant.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-gvariant.c Auto-merging src/libsystemd/sd-bus/test-bus-error.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-error.c Auto-merging src/libsystemd/sd-bus/test-bus-creds.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-creds.c Auto-merging src/libsystemd/sd-bus/test-bus-cleanup.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-cleanup.c Auto-merging src/libsystemd/sd-bus/test-bus-chat.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-chat.c Auto-merging src/libsystemd/sd-bus/test-bus-benchmark.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-benchmark.c Auto-merging src/libsystemd/sd-bus/test-bus-address.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/test-bus-address.c Auto-merging src/libsystemd/sd-bus/sd-bus.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/sd-bus.c Auto-merging src/libsystemd/sd-bus/bus-type.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-type.h Auto-merging src/libsystemd/sd-bus/bus-type.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-type.c Auto-merging src/libsystemd/sd-bus/bus-track.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-track.h Auto-merging src/libsystemd/sd-bus/bus-track.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-track.c Auto-merging src/libsystemd/sd-bus/bus-socket.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-socket.h Auto-merging src/libsystemd/sd-bus/bus-socket.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-socket.c Auto-merging src/libsystemd/sd-bus/bus-slot.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-slot.h Auto-merging src/libsystemd/sd-bus/bus-slot.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-slot.c Auto-merging src/libsystemd/sd-bus/bus-signature.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-signature.h Auto-merging src/libsystemd/sd-bus/bus-signature.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-signature.c Auto-merging src/libsystemd/sd-bus/bus-protocol.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-protocol.h Auto-merging src/libsystemd/sd-bus/bus-objects.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-objects.h Auto-merging src/libsystemd/sd-bus/bus-objects.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-objects.c Auto-merging src/libsystemd/sd-bus/bus-message.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-message.h Auto-merging src/libsystemd/sd-bus/bus-message.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-message.c Auto-merging src/libsystemd/sd-bus/bus-match.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-match.h Auto-merging src/libsystemd/sd-bus/bus-match.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-match.c Auto-merging src/libsystemd/sd-bus/bus-kernel.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-kernel.h Auto-merging src/libsystemd/sd-bus/bus-kernel.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-kernel.c Auto-merging src/libsystemd/sd-bus/bus-introspect.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-introspect.h Auto-merging src/libsystemd/sd-bus/bus-introspect.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-introspect.c Auto-merging src/libsystemd/sd-bus/bus-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-internal.h Auto-merging src/libsystemd/sd-bus/bus-internal.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-internal.c Auto-merging src/libsystemd/sd-bus/bus-gvariant.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-gvariant.h Auto-merging src/libsystemd/sd-bus/bus-gvariant.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-gvariant.c Auto-merging src/libsystemd/sd-bus/bus-error.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-error.h Auto-merging src/libsystemd/sd-bus/bus-error.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-error.c Auto-merging src/libsystemd/sd-bus/bus-dump.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-dump.h Auto-merging src/libsystemd/sd-bus/bus-dump.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-dump.c Auto-merging src/libsystemd/sd-bus/bus-creds.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-creds.h Auto-merging src/libsystemd/sd-bus/bus-creds.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-creds.c Auto-merging src/libsystemd/sd-bus/bus-convenience.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-convenience.c Auto-merging src/libsystemd/sd-bus/bus-control.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-control.h Auto-merging src/libsystemd/sd-bus/bus-control.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-control.c Auto-merging src/libsystemd/sd-bus/bus-container.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-container.h Auto-merging src/libsystemd/sd-bus/bus-container.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-container.c Auto-merging src/libsystemd/sd-bus/bus-common-errors.h CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-common-errors.h Auto-merging src/libsystemd/sd-bus/bus-common-errors.c CONFLICT (add/add): Merge conflict in src/libsystemd/sd-bus/bus-common-errors.c Auto-merging src/libsystemd/meson.build CONFLICT (add/add): Merge conflict in src/libsystemd/meson.build Auto-merging src/libsystemd/libsystemd.sym CONFLICT (add/add): Merge conflict in src/libsystemd/libsystemd.sym Auto-merging src/libsystemd/libsystemd.pc.in CONFLICT (add/add): Merge conflict in src/libsystemd/libsystemd.pc.in Auto-merging src/libsystemd/disable-mempool.c CONFLICT (add/add): Merge conflict in src/libsystemd/disable-mempool.c Auto-merging src/libsystemd-network/test-sd-dhcp-lease.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-sd-dhcp-lease.c Auto-merging src/libsystemd-network/test-ndisc-rs.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-ndisc-rs.c Auto-merging src/libsystemd-network/test-ndisc-ra.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-ndisc-ra.c Auto-merging src/libsystemd-network/test-lldp.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-lldp.c Auto-merging src/libsystemd-network/test-ipv4ll.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-ipv4ll.c Auto-merging src/libsystemd-network/test-ipv4ll-manual.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-ipv4ll-manual.c Auto-merging src/libsystemd-network/test-dhcp6-client.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-dhcp6-client.c Auto-merging src/libsystemd-network/test-dhcp-server.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-dhcp-server.c Auto-merging src/libsystemd-network/test-dhcp-option.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-dhcp-option.c Auto-merging src/libsystemd-network/test-dhcp-client.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-dhcp-client.c Auto-merging src/libsystemd-network/test-acd.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/test-acd.c Auto-merging src/libsystemd-network/sd-radv.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-radv.c Auto-merging src/libsystemd-network/sd-ndisc.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-ndisc.c Auto-merging src/libsystemd-network/sd-lldp.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-lldp.c Auto-merging src/libsystemd-network/sd-ipv4ll.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-ipv4ll.c Auto-merging src/libsystemd-network/sd-ipv4acd.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-ipv4acd.c Auto-merging src/libsystemd-network/sd-dhcp6-lease.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp6-lease.c Auto-merging src/libsystemd-network/sd-dhcp6-client.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp6-client.c Auto-merging src/libsystemd-network/sd-dhcp-server.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp-server.c Auto-merging src/libsystemd-network/sd-dhcp-lease.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp-lease.c Auto-merging src/libsystemd-network/sd-dhcp-client.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/sd-dhcp-client.c Auto-merging src/libsystemd-network/radv-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/radv-internal.h Auto-merging src/libsystemd-network/network-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/network-internal.h Auto-merging src/libsystemd-network/network-internal.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/network-internal.c Auto-merging src/libsystemd-network/ndisc-router.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/ndisc-router.h Auto-merging src/libsystemd-network/ndisc-router.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/ndisc-router.c Auto-merging src/libsystemd-network/ndisc-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/ndisc-internal.h Auto-merging src/libsystemd-network/meson.build CONFLICT (add/add): Merge conflict in src/libsystemd-network/meson.build Auto-merging src/libsystemd-network/lldp-network.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-network.h Auto-merging src/libsystemd-network/lldp-network.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-network.c Auto-merging src/libsystemd-network/lldp-neighbor.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-neighbor.h Auto-merging src/libsystemd-network/lldp-neighbor.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-neighbor.c Auto-merging src/libsystemd-network/lldp-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/lldp-internal.h Auto-merging src/libsystemd-network/icmp6-util.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/icmp6-util.h Auto-merging src/libsystemd-network/icmp6-util.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/icmp6-util.c Auto-merging src/libsystemd-network/dhcp6-protocol.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-protocol.h Auto-merging src/libsystemd-network/dhcp6-option.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-option.c Auto-merging src/libsystemd-network/dhcp6-network.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-network.c Auto-merging src/libsystemd-network/dhcp6-lease-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-lease-internal.h Auto-merging src/libsystemd-network/dhcp6-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp6-internal.h Auto-merging src/libsystemd-network/dhcp-server-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-server-internal.h Auto-merging src/libsystemd-network/dhcp-protocol.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-protocol.h Auto-merging src/libsystemd-network/dhcp-packet.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-packet.c Auto-merging src/libsystemd-network/dhcp-option.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-option.c Auto-merging src/libsystemd-network/dhcp-network.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-network.c Auto-merging src/libsystemd-network/dhcp-lease-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-lease-internal.h Auto-merging src/libsystemd-network/dhcp-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-internal.h Auto-merging src/libsystemd-network/dhcp-identifier.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-identifier.h Auto-merging src/libsystemd-network/dhcp-identifier.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-identifier.c Auto-merging src/libsystemd-network/dhcp-client-internal.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/dhcp-client-internal.h Auto-merging src/libsystemd-network/arp-util.h CONFLICT (add/add): Merge conflict in src/libsystemd-network/arp-util.h Auto-merging src/libsystemd-network/arp-util.c CONFLICT (add/add): Merge conflict in src/libsystemd-network/arp-util.c Auto-merging src/kernel-install/meson.build CONFLICT (add/add): Merge conflict in src/kernel-install/meson.build Auto-merging src/kernel-install/kernel-install CONFLICT (add/add): Merge conflict in src/kernel-install/kernel-install Auto-merging src/kernel-install/90-loaderentry.install CONFLICT (add/add): Merge conflict in src/kernel-install/90-loaderentry.install Auto-merging src/journal/test-mmap-cache.c CONFLICT (add/add): Merge conflict in src/journal/test-mmap-cache.c Auto-merging src/journal/test-journal.c CONFLICT (add/add): Merge conflict in src/journal/test-journal.c Auto-merging src/journal/test-journal-verify.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-verify.c Auto-merging src/journal/test-journal-syslog.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-syslog.c Auto-merging src/journal/test-journal-stream.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-stream.c Auto-merging src/journal/test-journal-send.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-send.c Auto-merging src/journal/test-journal-match.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-match.c Auto-merging src/journal/test-journal-interleaving.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-interleaving.c Auto-merging src/journal/test-journal-init.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-init.c Auto-merging src/journal/test-journal-flush.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-flush.c Auto-merging src/journal/test-journal-enum.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-enum.c Auto-merging src/journal/test-journal-config.c CONFLICT (add/add): Merge conflict in src/journal/test-journal-config.c Auto-merging src/journal/test-compress.c CONFLICT (add/add): Merge conflict in src/journal/test-compress.c Auto-merging src/journal/test-compress-benchmark.c CONFLICT (add/add): Merge conflict in src/journal/test-compress-benchmark.c Auto-merging src/journal/test-catalog.c CONFLICT (add/add): Merge conflict in src/journal/test-catalog.c Auto-merging src/journal/test-audit-type.c CONFLICT (add/add): Merge conflict in src/journal/test-audit-type.c Auto-merging src/journal/sd-journal.c CONFLICT (add/add): Merge conflict in src/journal/sd-journal.c Auto-merging src/journal/mmap-cache.h CONFLICT (add/add): Merge conflict in src/journal/mmap-cache.h Auto-merging src/journal/mmap-cache.c CONFLICT (add/add): Merge conflict in src/journal/mmap-cache.c Auto-merging src/journal/meson.build CONFLICT (add/add): Merge conflict in src/journal/meson.build Auto-merging src/journal/lookup3.h CONFLICT (add/add): Merge conflict in src/journal/lookup3.h Auto-merging src/journal/lookup3.c CONFLICT (add/add): Merge conflict in src/journal/lookup3.c Auto-merging src/journal/journald.conf CONFLICT (add/add): Merge conflict in src/journal/journald.conf Auto-merging src/journal/journald.c CONFLICT (add/add): Merge conflict in src/journal/journald.c Auto-merging src/journal/journald-wall.h CONFLICT (add/add): Merge conflict in src/journal/journald-wall.h Auto-merging src/journal/journald-wall.c CONFLICT (add/add): Merge conflict in src/journal/journald-wall.c Auto-merging src/journal/journald-syslog.h CONFLICT (add/add): Merge conflict in src/journal/journald-syslog.h Auto-merging src/journal/journald-syslog.c CONFLICT (add/add): Merge conflict in src/journal/journald-syslog.c Auto-merging src/journal/journald-stream.h CONFLICT (add/add): Merge conflict in src/journal/journald-stream.h Auto-merging src/journal/journald-stream.c CONFLICT (add/add): Merge conflict in src/journal/journald-stream.c Auto-merging src/journal/journald-server.h CONFLICT (add/add): Merge conflict in src/journal/journald-server.h Auto-merging src/journal/journald-server.c CONFLICT (add/add): Merge conflict in src/journal/journald-server.c Auto-merging src/journal/journald-rate-limit.h CONFLICT (add/add): Merge conflict in src/journal/journald-rate-limit.h Auto-merging src/journal/journald-rate-limit.c CONFLICT (add/add): Merge conflict in src/journal/journald-rate-limit.c Auto-merging src/journal/journald-native.h CONFLICT (add/add): Merge conflict in src/journal/journald-native.h Auto-merging src/journal/journald-native.c CONFLICT (add/add): Merge conflict in src/journal/journald-native.c Auto-merging src/journal/journald-kmsg.h CONFLICT (add/add): Merge conflict in src/journal/journald-kmsg.h Auto-merging src/journal/journald-kmsg.c CONFLICT (add/add): Merge conflict in src/journal/journald-kmsg.c Auto-merging src/journal/journald-context.h CONFLICT (add/add): Merge conflict in src/journal/journald-context.h Auto-merging src/journal/journald-context.c CONFLICT (add/add): Merge conflict in src/journal/journald-context.c Auto-merging src/journal/journald-console.h CONFLICT (add/add): Merge conflict in src/journal/journald-console.h Auto-merging src/journal/journald-console.c CONFLICT (add/add): Merge conflict in src/journal/journald-console.c Auto-merging src/journal/journald-audit.h CONFLICT (add/add): Merge conflict in src/journal/journald-audit.h Auto-merging src/journal/journald-audit.c CONFLICT (add/add): Merge conflict in src/journal/journald-audit.c Auto-merging src/journal/journalctl.c CONFLICT (add/add): Merge conflict in src/journal/journalctl.c Auto-merging src/journal/journal-verify.h CONFLICT (add/add): Merge conflict in src/journal/journal-verify.h Auto-merging src/journal/journal-verify.c CONFLICT (add/add): Merge conflict in src/journal/journal-verify.c Auto-merging src/journal/journal-vacuum.h CONFLICT (add/add): Merge conflict in src/journal/journal-vacuum.h Auto-merging src/journal/journal-vacuum.c CONFLICT (add/add): Merge conflict in src/journal/journal-vacuum.c Auto-merging src/journal/journal-send.c CONFLICT (add/add): Merge conflict in src/journal/journal-send.c Auto-merging src/journal/journal-internal.h CONFLICT (add/add): Merge conflict in src/journal/journal-internal.h Auto-merging src/journal/journal-file.h CONFLICT (add/add): Merge conflict in src/journal/journal-file.h Auto-merging src/journal/journal-file.c CONFLICT (add/add): Merge conflict in src/journal/journal-file.c Auto-merging src/journal/journal-def.h CONFLICT (add/add): Merge conflict in src/journal/journal-def.h Auto-merging src/journal/journal-authenticate.h CONFLICT (add/add): Merge conflict in src/journal/journal-authenticate.h Auto-merging src/journal/journal-authenticate.c CONFLICT (add/add): Merge conflict in src/journal/journal-authenticate.c Auto-merging src/journal/fsprg.h CONFLICT (add/add): Merge conflict in src/journal/fsprg.h Auto-merging src/journal/fsprg.c CONFLICT (add/add): Merge conflict in src/journal/fsprg.c Auto-merging src/journal/compress.h CONFLICT (add/add): Merge conflict in src/journal/compress.h Auto-merging src/journal/compress.c CONFLICT (add/add): Merge conflict in src/journal/compress.c Auto-merging src/journal/catalog.h CONFLICT (add/add): Merge conflict in src/journal/catalog.h Auto-merging src/journal/catalog.c CONFLICT (add/add): Merge conflict in src/journal/catalog.c Auto-merging src/journal/cat.c CONFLICT (add/add): Merge conflict in src/journal/cat.c Auto-merging src/journal/audit-type.h CONFLICT (add/add): Merge conflict in src/journal/audit-type.h Auto-merging src/journal/audit-type.c CONFLICT (add/add): Merge conflict in src/journal/audit-type.c Auto-merging src/journal-remote/microhttpd-util.h CONFLICT (add/add): Merge conflict in src/journal-remote/microhttpd-util.h Auto-merging src/journal-remote/microhttpd-util.c CONFLICT (add/add): Merge conflict in src/journal-remote/microhttpd-util.c Auto-merging src/journal-remote/meson.build CONFLICT (add/add): Merge conflict in src/journal-remote/meson.build Auto-merging src/journal-remote/journal-upload.h CONFLICT (add/add): Merge conflict in src/journal-remote/journal-upload.h Auto-merging src/journal-remote/journal-upload.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-upload.c Auto-merging src/journal-remote/journal-upload-journal.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-upload-journal.c Auto-merging src/journal-remote/journal-remote.h CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote.h Auto-merging src/journal-remote/journal-remote.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote.c Auto-merging src/journal-remote/journal-remote-write.h CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-write.h Auto-merging src/journal-remote/journal-remote-write.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-write.c Auto-merging src/journal-remote/journal-remote-parse.h CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-parse.h Auto-merging src/journal-remote/journal-remote-parse.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-parse.c Auto-merging src/journal-remote/journal-remote-main.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-remote-main.c Auto-merging src/journal-remote/journal-gatewayd.c CONFLICT (add/add): Merge conflict in src/journal-remote/journal-gatewayd.c Auto-merging src/initctl/initctl.c CONFLICT (add/add): Merge conflict in src/initctl/initctl.c Auto-merging src/import/test-qcow2.c CONFLICT (add/add): Merge conflict in src/import/test-qcow2.c Auto-merging src/import/qcow2-util.h CONFLICT (add/add): Merge conflict in src/import/qcow2-util.h Auto-merging src/import/qcow2-util.c CONFLICT (add/add): Merge conflict in src/import/qcow2-util.c Auto-merging src/import/pull.c CONFLICT (add/add): Merge conflict in src/import/pull.c Auto-merging src/import/pull-tar.h CONFLICT (add/add): Merge conflict in src/import/pull-tar.h Auto-merging src/import/pull-tar.c CONFLICT (add/add): Merge conflict in src/import/pull-tar.c Auto-merging src/import/pull-raw.h CONFLICT (add/add): Merge conflict in src/import/pull-raw.h Auto-merging src/import/pull-raw.c CONFLICT (add/add): Merge conflict in src/import/pull-raw.c Auto-merging src/import/pull-job.h CONFLICT (add/add): Merge conflict in src/import/pull-job.h Auto-merging src/import/pull-job.c CONFLICT (add/add): Merge conflict in src/import/pull-job.c Auto-merging src/import/pull-common.h CONFLICT (add/add): Merge conflict in src/import/pull-common.h Auto-merging src/import/pull-common.c CONFLICT (add/add): Merge conflict in src/import/pull-common.c Auto-merging src/import/org.freedesktop.import1.service CONFLICT (add/add): Merge conflict in src/import/org.freedesktop.import1.service Auto-merging src/import/org.freedesktop.import1.policy CONFLICT (add/add): Merge conflict in src/import/org.freedesktop.import1.policy Auto-merging src/import/org.freedesktop.import1.conf CONFLICT (add/add): Merge conflict in src/import/org.freedesktop.import1.conf Auto-merging src/import/meson.build CONFLICT (add/add): Merge conflict in src/import/meson.build Auto-merging src/import/importd.c CONFLICT (add/add): Merge conflict in src/import/importd.c Auto-merging src/import/import.c CONFLICT (add/add): Merge conflict in src/import/import.c Auto-merging src/import/import-tar.h CONFLICT (add/add): Merge conflict in src/import/import-tar.h Auto-merging src/import/import-tar.c CONFLICT (add/add): Merge conflict in src/import/import-tar.c Auto-merging src/import/import-raw.h CONFLICT (add/add): Merge conflict in src/import/import-raw.h Auto-merging src/import/import-raw.c CONFLICT (add/add): Merge conflict in src/import/import-raw.c Auto-merging src/import/import-fs.c CONFLICT (add/add): Merge conflict in src/import/import-fs.c Auto-merging src/import/import-compress.h CONFLICT (add/add): Merge conflict in src/import/import-compress.h Auto-merging src/import/import-compress.c CONFLICT (add/add): Merge conflict in src/import/import-compress.c Auto-merging src/import/import-common.h CONFLICT (add/add): Merge conflict in src/import/import-common.h Auto-merging src/import/import-common.c CONFLICT (add/add): Merge conflict in src/import/import-common.c Auto-merging src/import/export.c CONFLICT (add/add): Merge conflict in src/import/export.c Auto-merging src/import/export-tar.h CONFLICT (add/add): Merge conflict in src/import/export-tar.h Auto-merging src/import/export-tar.c CONFLICT (add/add): Merge conflict in src/import/export-tar.c Auto-merging src/import/export-raw.h CONFLICT (add/add): Merge conflict in src/import/export-raw.h Auto-merging src/import/export-raw.c CONFLICT (add/add): Merge conflict in src/import/export-raw.c Auto-merging src/import/curl-util.h CONFLICT (add/add): Merge conflict in src/import/curl-util.h Auto-merging src/import/curl-util.c CONFLICT (add/add): Merge conflict in src/import/curl-util.c Auto-merging src/id128/id128.c CONFLICT (add/add): Merge conflict in src/id128/id128.c Auto-merging src/hwdb/hwdb.c CONFLICT (add/add): Merge conflict in src/hwdb/hwdb.c Auto-merging src/hostname/org.freedesktop.hostname1.service CONFLICT (add/add): Merge conflict in src/hostname/org.freedesktop.hostname1.service Auto-merging src/hostname/org.freedesktop.hostname1.policy CONFLICT (add/add): Merge conflict in src/hostname/org.freedesktop.hostname1.policy Auto-merging src/hostname/org.freedesktop.hostname1.conf CONFLICT (add/add): Merge conflict in src/hostname/org.freedesktop.hostname1.conf Auto-merging src/hostname/meson.build CONFLICT (add/add): Merge conflict in src/hostname/meson.build Auto-merging src/hostname/hostnamed.c CONFLICT (add/add): Merge conflict in src/hostname/hostnamed.c Auto-merging src/hostname/hostnamectl.c CONFLICT (add/add): Merge conflict in src/hostname/hostnamectl.c Auto-merging src/home/user-record-util.h CONFLICT (add/add): Merge conflict in src/home/user-record-util.h Auto-merging src/home/user-record-util.c CONFLICT (add/add): Merge conflict in src/home/user-record-util.c Auto-merging src/home/user-record-sign.h CONFLICT (add/add): Merge conflict in src/home/user-record-sign.h Auto-merging src/home/user-record-sign.c CONFLICT (add/add): Merge conflict in src/home/user-record-sign.c Auto-merging src/home/pam_systemd_home.sym CONFLICT (add/add): Merge conflict in src/home/pam_systemd_home.sym Auto-merging src/home/pam_systemd_home.c CONFLICT (add/add): Merge conflict in src/home/pam_systemd_home.c Auto-merging src/home/org.freedesktop.home1.service CONFLICT (add/add): Merge conflict in src/home/org.freedesktop.home1.service Auto-merging src/home/org.freedesktop.home1.policy CONFLICT (add/add): Merge conflict in src/home/org.freedesktop.home1.policy Auto-merging src/home/org.freedesktop.home1.conf CONFLICT (add/add): Merge conflict in src/home/org.freedesktop.home1.conf Auto-merging src/home/meson.build CONFLICT (add/add): Merge conflict in src/home/meson.build Auto-merging src/home/homework.h CONFLICT (add/add): Merge conflict in src/home/homework.h Auto-merging src/home/homework.c CONFLICT (add/add): Merge conflict in src/home/homework.c Auto-merging src/home/homework-quota.h CONFLICT (add/add): Merge conflict in src/home/homework-quota.h Auto-merging src/home/homework-quota.c CONFLICT (add/add): Merge conflict in src/home/homework-quota.c Auto-merging src/home/homework-pkcs11.h CONFLICT (add/add): Merge conflict in src/home/homework-pkcs11.h Auto-merging src/home/homework-pkcs11.c CONFLICT (add/add): Merge conflict in src/home/homework-pkcs11.c Auto-merging src/home/homework-mount.h CONFLICT (add/add): Merge conflict in src/home/homework-mount.h Auto-merging src/home/homework-mount.c CONFLICT (add/add): Merge conflict in src/home/homework-mount.c Auto-merging src/home/homework-luks.h CONFLICT (add/add): Merge conflict in src/home/homework-luks.h Auto-merging src/home/homework-luks.c CONFLICT (add/add): Merge conflict in src/home/homework-luks.c Auto-merging src/home/homework-fscrypt.h CONFLICT (add/add): Merge conflict in src/home/homework-fscrypt.h Auto-merging src/home/homework-fscrypt.c CONFLICT (add/add): Merge conflict in src/home/homework-fscrypt.c Auto-merging src/home/homework-directory.h CONFLICT (add/add): Merge conflict in src/home/homework-directory.h Auto-merging src/home/homework-directory.c CONFLICT (add/add): Merge conflict in src/home/homework-directory.c Auto-merging src/home/homework-cifs.h CONFLICT (add/add): Merge conflict in src/home/homework-cifs.h Auto-merging src/home/homework-cifs.c CONFLICT (add/add): Merge conflict in src/home/homework-cifs.c Auto-merging src/home/homed.conf CONFLICT (add/add): Merge conflict in src/home/homed.conf Auto-merging src/home/homed.c CONFLICT (add/add): Merge conflict in src/home/homed.c Auto-merging src/home/homed-varlink.h CONFLICT (add/add): Merge conflict in src/home/homed-varlink.h Auto-merging src/home/homed-varlink.c CONFLICT (add/add): Merge conflict in src/home/homed-varlink.c Auto-merging src/home/homed-operation.h CONFLICT (add/add): Merge conflict in src/home/homed-operation.h Auto-merging src/home/homed-operation.c CONFLICT (add/add): Merge conflict in src/home/homed-operation.c Auto-merging src/home/homed-manager.h CONFLICT (add/add): Merge conflict in src/home/homed-manager.h Auto-merging src/home/homed-manager.c CONFLICT (add/add): Merge conflict in src/home/homed-manager.c Auto-merging src/home/homed-manager-bus.h CONFLICT (add/add): Merge conflict in src/home/homed-manager-bus.h Auto-merging src/home/homed-manager-bus.c CONFLICT (add/add): Merge conflict in src/home/homed-manager-bus.c Auto-merging src/home/homed-home.h CONFLICT (add/add): Merge conflict in src/home/homed-home.h Auto-merging src/home/homed-home.c CONFLICT (add/add): Merge conflict in src/home/homed-home.c Auto-merging src/home/homed-home-bus.h CONFLICT (add/add): Merge conflict in src/home/homed-home-bus.h Auto-merging src/home/homed-home-bus.c CONFLICT (add/add): Merge conflict in src/home/homed-home-bus.c Auto-merging src/home/homed-conf.h CONFLICT (add/add): Merge conflict in src/home/homed-conf.h Auto-merging src/home/homed-conf.c CONFLICT (add/add): Merge conflict in src/home/homed-conf.c Auto-merging src/home/homed-bus.h CONFLICT (add/add): Merge conflict in src/home/homed-bus.h Auto-merging src/home/homed-bus.c CONFLICT (add/add): Merge conflict in src/home/homed-bus.c Auto-merging src/home/homectl.c CONFLICT (add/add): Merge conflict in src/home/homectl.c Auto-merging src/home/home-util.h CONFLICT (add/add): Merge conflict in src/home/home-util.h Auto-merging src/home/home-util.c CONFLICT (add/add): Merge conflict in src/home/home-util.c Auto-merging src/hibernate-resume/hibernate-resume.c CONFLICT (add/add): Merge conflict in src/hibernate-resume/hibernate-resume.c Auto-merging src/hibernate-resume/hibernate-resume-generator.c CONFLICT (add/add): Merge conflict in src/hibernate-resume/hibernate-resume-generator.c Auto-merging src/gpt-auto-generator/gpt-auto-generator.c CONFLICT (add/add): Merge conflict in src/gpt-auto-generator/gpt-auto-generator.c Auto-merging src/getty-generator/getty-generator.c CONFLICT (add/add): Merge conflict in src/getty-generator/getty-generator.c Auto-merging src/fuzz/meson.build CONFLICT (add/add): Merge conflict in src/fuzz/meson.build Auto-merging src/fuzz/fuzz.h CONFLICT (add/add): Merge conflict in src/fuzz/fuzz.h Auto-merging src/fuzz/fuzz-xdg-desktop.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-xdg-desktop.c Auto-merging src/fuzz/fuzz-varlink.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-varlink.c Auto-merging src/fuzz/fuzz-unit-file.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-unit-file.c Auto-merging src/fuzz/fuzz-udev-rules.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-udev-rules.c Auto-merging src/fuzz/fuzz-udev-database.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-udev-database.c Auto-merging src/fuzz/fuzz-time-util.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-time-util.c Auto-merging src/fuzz/fuzz-nspawn-settings.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-nspawn-settings.c Auto-merging src/fuzz/fuzz-nspawn-oci.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-nspawn-oci.c Auto-merging src/fuzz/fuzz-ndisc-rs.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-ndisc-rs.c Auto-merging src/fuzz/fuzz-main.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-main.c Auto-merging src/fuzz/fuzz-lldp.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-lldp.c Auto-merging src/fuzz/fuzz-json.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-json.c Auto-merging src/fuzz/fuzz-journald.h CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald.h Auto-merging src/fuzz/fuzz-journald.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald.c Auto-merging src/fuzz/fuzz-journald-syslog.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-syslog.c Auto-merging src/fuzz/fuzz-journald-stream.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-stream.c Auto-merging src/fuzz/fuzz-journald-native.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-native.c Auto-merging src/fuzz/fuzz-journald-native-fd.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-native-fd.c Auto-merging src/fuzz/fuzz-journald-kmsg.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-kmsg.c Auto-merging src/fuzz/fuzz-journald-audit.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journald-audit.c Auto-merging src/fuzz/fuzz-journal-remote.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-journal-remote.c Auto-merging src/fuzz/fuzz-hostname-util.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-hostname-util.c Auto-merging src/fuzz/fuzz-env-file.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-env-file.c Auto-merging src/fuzz/fuzz-dns-packet.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-dns-packet.c Auto-merging src/fuzz/fuzz-dhcp6-client.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-dhcp6-client.c Auto-merging src/fuzz/fuzz-dhcp-server.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-dhcp-server.c Auto-merging src/fuzz/fuzz-compress.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-compress.c Auto-merging src/fuzz/fuzz-catalog.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-catalog.c Auto-merging src/fuzz/fuzz-calendarspec.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-calendarspec.c Auto-merging src/fuzz/fuzz-bus-message.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-bus-message.c Auto-merging src/fuzz/fuzz-bus-label.c CONFLICT (add/add): Merge conflict in src/fuzz/fuzz-bus-label.c Auto-merging src/fstab-generator/fstab-generator.c CONFLICT (add/add): Merge conflict in src/fstab-generator/fstab-generator.c Auto-merging src/fsck/fsck.c CONFLICT (add/add): Merge conflict in src/fsck/fsck.c Auto-merging src/firstboot/firstboot.c CONFLICT (add/add): Merge conflict in src/firstboot/firstboot.c Auto-merging src/escape/escape.c CONFLICT (add/add): Merge conflict in src/escape/escape.c Auto-merging src/environment-d-generator/environment-d-generator.c CONFLICT (add/add): Merge conflict in src/environment-d-generator/environment-d-generator.c Auto-merging src/dissect/dissect.c CONFLICT (add/add): Merge conflict in src/dissect/dissect.c Auto-merging src/detect-virt/detect-virt.c CONFLICT (add/add): Merge conflict in src/detect-virt/detect-virt.c Auto-merging src/delta/delta.c CONFLICT (add/add): Merge conflict in src/delta/delta.c Auto-merging src/debug-generator/debug-generator.c CONFLICT (add/add): Merge conflict in src/debug-generator/debug-generator.c Auto-merging src/cryptsetup/cryptsetup.c CONFLICT (add/add): Merge conflict in src/cryptsetup/cryptsetup.c Auto-merging src/cryptsetup/cryptsetup-pkcs11.h CONFLICT (add/add): Merge conflict in src/cryptsetup/cryptsetup-pkcs11.h Auto-merging src/cryptsetup/cryptsetup-pkcs11.c CONFLICT (add/add): Merge conflict in src/cryptsetup/cryptsetup-pkcs11.c Auto-merging src/cryptsetup/cryptsetup-generator.c CONFLICT (add/add): Merge conflict in src/cryptsetup/cryptsetup-generator.c Auto-merging src/coredump/test-coredump-vacuum.c CONFLICT (add/add): Merge conflict in src/coredump/test-coredump-vacuum.c Auto-merging src/coredump/stacktrace.h CONFLICT (add/add): Merge conflict in src/coredump/stacktrace.h Auto-merging src/coredump/stacktrace.c CONFLICT (add/add): Merge conflict in src/coredump/stacktrace.c Auto-merging src/coredump/meson.build CONFLICT (add/add): Merge conflict in src/coredump/meson.build Auto-merging src/coredump/coredumpctl.c CONFLICT (add/add): Merge conflict in src/coredump/coredumpctl.c Auto-merging src/coredump/coredump.c CONFLICT (add/add): Merge conflict in src/coredump/coredump.c Auto-merging src/coredump/coredump-vacuum.h CONFLICT (add/add): Merge conflict in src/coredump/coredump-vacuum.h Auto-merging src/coredump/coredump-vacuum.c CONFLICT (add/add): Merge conflict in src/coredump/coredump-vacuum.c Auto-merging src/core/unit.h CONFLICT (add/add): Merge conflict in src/core/unit.h Auto-merging src/core/unit.c CONFLICT (add/add): Merge conflict in src/core/unit.c Auto-merging src/core/unit-printf.h CONFLICT (add/add): Merge conflict in src/core/unit-printf.h Auto-merging src/core/unit-printf.c CONFLICT (add/add): Merge conflict in src/core/unit-printf.c Auto-merging src/core/triggers.systemd.in CONFLICT (add/add): Merge conflict in src/core/triggers.systemd.in Auto-merging src/core/transaction.h CONFLICT (add/add): Merge conflict in src/core/transaction.h Auto-merging src/core/transaction.c CONFLICT (add/add): Merge conflict in src/core/transaction.c Auto-merging src/core/timer.h CONFLICT (add/add): Merge conflict in src/core/timer.h Auto-merging src/core/timer.c CONFLICT (add/add): Merge conflict in src/core/timer.c Auto-merging src/core/target.h CONFLICT (add/add): Merge conflict in src/core/target.h Auto-merging src/core/target.c CONFLICT (add/add): Merge conflict in src/core/target.c Auto-merging src/core/systemd.pc.in CONFLICT (add/add): Merge conflict in src/core/systemd.pc.in Auto-merging src/core/swap.h CONFLICT (add/add): Merge conflict in src/core/swap.h Auto-merging src/core/swap.c CONFLICT (add/add): Merge conflict in src/core/swap.c Auto-merging src/core/socket.h CONFLICT (add/add): Merge conflict in src/core/socket.h Auto-merging src/core/socket.c CONFLICT (add/add): Merge conflict in src/core/socket.c Auto-merging src/core/smack-setup.h CONFLICT (add/add): Merge conflict in src/core/smack-setup.h Auto-merging src/core/smack-setup.c CONFLICT (add/add): Merge conflict in src/core/smack-setup.c Auto-merging src/core/slice.h CONFLICT (add/add): Merge conflict in src/core/slice.h Auto-merging src/core/slice.c CONFLICT (add/add): Merge conflict in src/core/slice.c Auto-merging src/core/show-status.h CONFLICT (add/add): Merge conflict in src/core/show-status.h Auto-merging src/core/show-status.c CONFLICT (add/add): Merge conflict in src/core/show-status.c Auto-merging src/core/service.h CONFLICT (add/add): Merge conflict in src/core/service.h Auto-merging src/core/service.c CONFLICT (add/add): Merge conflict in src/core/service.c Auto-merging src/core/selinux-setup.h CONFLICT (add/add): Merge conflict in src/core/selinux-setup.h Auto-merging src/core/selinux-setup.c CONFLICT (add/add): Merge conflict in src/core/selinux-setup.c Auto-merging src/core/selinux-access.h CONFLICT (add/add): Merge conflict in src/core/selinux-access.h Auto-merging src/core/selinux-access.c CONFLICT (add/add): Merge conflict in src/core/selinux-access.c Auto-merging src/core/scope.h CONFLICT (add/add): Merge conflict in src/core/scope.h Auto-merging src/core/scope.c CONFLICT (add/add): Merge conflict in src/core/scope.c Auto-merging src/core/path.h CONFLICT (add/add): Merge conflict in src/core/path.h Auto-merging src/core/path.c CONFLICT (add/add): Merge conflict in src/core/path.c Auto-merging src/core/org.freedesktop.systemd1.service CONFLICT (add/add): Merge conflict in src/core/org.freedesktop.systemd1.service Auto-merging src/core/org.freedesktop.systemd1.policy.in CONFLICT (add/add): Merge conflict in src/core/org.freedesktop.systemd1.policy.in Auto-merging src/core/org.freedesktop.systemd1.conf CONFLICT (add/add): Merge conflict in src/core/org.freedesktop.systemd1.conf Auto-merging src/core/namespace.h CONFLICT (add/add): Merge conflict in src/core/namespace.h Auto-merging src/core/namespace.c CONFLICT (add/add): Merge conflict in src/core/namespace.c Auto-merging src/core/mount.h CONFLICT (add/add): Merge conflict in src/core/mount.h Auto-merging src/core/mount.c CONFLICT (add/add): Merge conflict in src/core/mount.c Auto-merging src/core/mount-setup.h CONFLICT (add/add): Merge conflict in src/core/mount-setup.h Auto-merging src/core/mount-setup.c CONFLICT (add/add): Merge conflict in src/core/mount-setup.c Auto-merging src/core/meson.build CONFLICT (add/add): Merge conflict in src/core/meson.build Auto-merging src/core/manager.h CONFLICT (add/add): Merge conflict in src/core/manager.h Auto-merging src/core/manager.c CONFLICT (add/add): Merge conflict in src/core/manager.c Auto-merging src/core/main.c CONFLICT (add/add): Merge conflict in src/core/main.c Auto-merging src/core/macros.systemd.in CONFLICT (add/add): Merge conflict in src/core/macros.systemd.in Auto-merging src/core/machine-id-setup.h CONFLICT (add/add): Merge conflict in src/core/machine-id-setup.h Auto-merging src/core/machine-id-setup.c CONFLICT (add/add): Merge conflict in src/core/machine-id-setup.c Auto-merging src/core/loopback-setup.h CONFLICT (add/add): Merge conflict in src/core/loopback-setup.h Auto-merging src/core/loopback-setup.c CONFLICT (add/add): Merge conflict in src/core/loopback-setup.c Auto-merging src/core/locale-setup.h CONFLICT (add/add): Merge conflict in src/core/locale-setup.h Auto-merging src/core/locale-setup.c CONFLICT (add/add): Merge conflict in src/core/locale-setup.c Auto-merging src/core/load-fragment.h CONFLICT (add/add): Merge conflict in src/core/load-fragment.h Auto-merging src/core/load-fragment.c CONFLICT (add/add): Merge conflict in src/core/load-fragment.c Auto-merging src/core/load-fragment-gperf.gperf.m4 CONFLICT (add/add): Merge conflict in src/core/load-fragment-gperf.gperf.m4 Auto-merging src/core/load-dropin.h CONFLICT (add/add): Merge conflict in src/core/load-dropin.h Auto-merging src/core/load-dropin.c CONFLICT (add/add): Merge conflict in src/core/load-dropin.c Auto-merging src/core/kmod-setup.h CONFLICT (add/add): Merge conflict in src/core/kmod-setup.h Auto-merging src/core/kmod-setup.c CONFLICT (add/add): Merge conflict in src/core/kmod-setup.c Auto-merging src/core/killall.h CONFLICT (add/add): Merge conflict in src/core/killall.h Auto-merging src/core/killall.c CONFLICT (add/add): Merge conflict in src/core/killall.c Auto-merging src/core/kill.h CONFLICT (add/add): Merge conflict in src/core/kill.h Auto-merging src/core/kill.c CONFLICT (add/add): Merge conflict in src/core/kill.c Auto-merging src/core/job.h CONFLICT (add/add): Merge conflict in src/core/job.h Auto-merging src/core/job.c CONFLICT (add/add): Merge conflict in src/core/job.c Auto-merging src/core/ip-address-access.h CONFLICT (add/add): Merge conflict in src/core/ip-address-access.h Auto-merging src/core/ip-address-access.c CONFLICT (add/add): Merge conflict in src/core/ip-address-access.c Auto-merging src/core/ima-setup.h CONFLICT (add/add): Merge conflict in src/core/ima-setup.h Auto-merging src/core/ima-setup.c CONFLICT (add/add): Merge conflict in src/core/ima-setup.c Auto-merging src/core/hostname-setup.h CONFLICT (add/add): Merge conflict in src/core/hostname-setup.h Auto-merging src/core/hostname-setup.c CONFLICT (add/add): Merge conflict in src/core/hostname-setup.c Auto-merging src/core/generator-setup.h CONFLICT (add/add): Merge conflict in src/core/generator-setup.h Auto-merging src/core/generator-setup.c CONFLICT (add/add): Merge conflict in src/core/generator-setup.c Auto-merging src/core/execute.h CONFLICT (add/add): Merge conflict in src/core/execute.h Auto-merging src/core/execute.c CONFLICT (add/add): Merge conflict in src/core/execute.c Auto-merging src/core/emergency-action.h CONFLICT (add/add): Merge conflict in src/core/emergency-action.h Auto-merging src/core/emergency-action.c CONFLICT (add/add): Merge conflict in src/core/emergency-action.c Auto-merging src/core/efi-random.h CONFLICT (add/add): Merge conflict in src/core/efi-random.h Auto-merging src/core/efi-random.c CONFLICT (add/add): Merge conflict in src/core/efi-random.c Auto-merging src/core/dynamic-user.h CONFLICT (add/add): Merge conflict in src/core/dynamic-user.h Auto-merging src/core/dynamic-user.c CONFLICT (add/add): Merge conflict in src/core/dynamic-user.c Auto-merging src/core/device.h CONFLICT (add/add): Merge conflict in src/core/device.h Auto-merging src/core/device.c CONFLICT (add/add): Merge conflict in src/core/device.c Auto-merging src/core/dbus.h CONFLICT (add/add): Merge conflict in src/core/dbus.h Auto-merging src/core/dbus.c CONFLICT (add/add): Merge conflict in src/core/dbus.c Auto-merging src/core/dbus-util.h CONFLICT (add/add): Merge conflict in src/core/dbus-util.h Auto-merging src/core/dbus-util.c CONFLICT (add/add): Merge conflict in src/core/dbus-util.c Auto-merging src/core/dbus-unit.h CONFLICT (add/add): Merge conflict in src/core/dbus-unit.h Auto-merging src/core/dbus-unit.c CONFLICT (add/add): Merge conflict in src/core/dbus-unit.c Auto-merging src/core/dbus-timer.h CONFLICT (add/add): Merge conflict in src/core/dbus-timer.h Auto-merging src/core/dbus-timer.c CONFLICT (add/add): Merge conflict in src/core/dbus-timer.c Auto-merging src/core/dbus-target.h CONFLICT (add/add): Merge conflict in src/core/dbus-target.h Auto-merging src/core/dbus-target.c CONFLICT (add/add): Merge conflict in src/core/dbus-target.c Auto-merging src/core/dbus-swap.h CONFLICT (add/add): Merge conflict in src/core/dbus-swap.h Auto-merging src/core/dbus-swap.c CONFLICT (add/add): Merge conflict in src/core/dbus-swap.c Auto-merging src/core/dbus-socket.h CONFLICT (add/add): Merge conflict in src/core/dbus-socket.h Auto-merging src/core/dbus-socket.c CONFLICT (add/add): Merge conflict in src/core/dbus-socket.c Auto-merging src/core/dbus-slice.h CONFLICT (add/add): Merge conflict in src/core/dbus-slice.h Auto-merging src/core/dbus-slice.c CONFLICT (add/add): Merge conflict in src/core/dbus-slice.c Auto-merging src/core/dbus-service.h CONFLICT (add/add): Merge conflict in src/core/dbus-service.h Auto-merging src/core/dbus-service.c CONFLICT (add/add): Merge conflict in src/core/dbus-service.c Auto-merging src/core/dbus-scope.h CONFLICT (add/add): Merge conflict in src/core/dbus-scope.h Auto-merging src/core/dbus-scope.c CONFLICT (add/add): Merge conflict in src/core/dbus-scope.c Auto-merging src/core/dbus-path.h CONFLICT (add/add): Merge conflict in src/core/dbus-path.h Auto-merging src/core/dbus-path.c CONFLICT (add/add): Merge conflict in src/core/dbus-path.c Auto-merging src/core/dbus-mount.h CONFLICT (add/add): Merge conflict in src/core/dbus-mount.h Auto-merging src/core/dbus-mount.c CONFLICT (add/add): Merge conflict in src/core/dbus-mount.c Auto-merging src/core/dbus-manager.h CONFLICT (add/add): Merge conflict in src/core/dbus-manager.h Auto-merging src/core/dbus-manager.c CONFLICT (add/add): Merge conflict in src/core/dbus-manager.c Auto-merging src/core/dbus-kill.h CONFLICT (add/add): Merge conflict in src/core/dbus-kill.h Auto-merging src/core/dbus-kill.c CONFLICT (add/add): Merge conflict in src/core/dbus-kill.c Auto-merging src/core/dbus-job.h CONFLICT (add/add): Merge conflict in src/core/dbus-job.h Auto-merging src/core/dbus-job.c CONFLICT (add/add): Merge conflict in src/core/dbus-job.c Auto-merging src/core/dbus-execute.h CONFLICT (add/add): Merge conflict in src/core/dbus-execute.h Auto-merging src/core/dbus-execute.c CONFLICT (add/add): Merge conflict in src/core/dbus-execute.c Auto-merging src/core/dbus-device.h CONFLICT (add/add): Merge conflict in src/core/dbus-device.h Auto-merging src/core/dbus-device.c CONFLICT (add/add): Merge conflict in src/core/dbus-device.c Auto-merging src/core/dbus-cgroup.h CONFLICT (add/add): Merge conflict in src/core/dbus-cgroup.h Auto-merging src/core/dbus-cgroup.c CONFLICT (add/add): Merge conflict in src/core/dbus-cgroup.c Auto-merging src/core/dbus-automount.h CONFLICT (add/add): Merge conflict in src/core/dbus-automount.h Auto-merging src/core/dbus-automount.c CONFLICT (add/add): Merge conflict in src/core/dbus-automount.c Auto-merging src/core/core-varlink.h CONFLICT (add/add): Merge conflict in src/core/core-varlink.h Auto-merging src/core/core-varlink.c CONFLICT (add/add): Merge conflict in src/core/core-varlink.c Auto-merging src/core/cgroup.h CONFLICT (add/add): Merge conflict in src/core/cgroup.h Auto-merging src/core/cgroup.c CONFLICT (add/add): Merge conflict in src/core/cgroup.c Auto-merging src/core/bpf-firewall.h CONFLICT (add/add): Merge conflict in src/core/bpf-firewall.h Auto-merging src/core/bpf-firewall.c CONFLICT (add/add): Merge conflict in src/core/bpf-firewall.c Auto-merging src/core/bpf-devices.h CONFLICT (add/add): Merge conflict in src/core/bpf-devices.h Auto-merging src/core/bpf-devices.c CONFLICT (add/add): Merge conflict in src/core/bpf-devices.c Auto-merging src/core/automount.h CONFLICT (add/add): Merge conflict in src/core/automount.h Auto-merging src/core/automount.c CONFLICT (add/add): Merge conflict in src/core/automount.c Auto-merging src/core/audit-fd.h CONFLICT (add/add): Merge conflict in src/core/audit-fd.h Auto-merging src/core/audit-fd.c CONFLICT (add/add): Merge conflict in src/core/audit-fd.c Auto-merging src/core/all-units.h CONFLICT (add/add): Merge conflict in src/core/all-units.h Auto-merging src/cgtop/cgtop.c CONFLICT (add/add): Merge conflict in src/cgtop/cgtop.c Auto-merging src/cgroups-agent/cgroups-agent.c CONFLICT (add/add): Merge conflict in src/cgroups-agent/cgroups-agent.c Auto-merging src/cgls/cgls.c CONFLICT (add/add): Merge conflict in src/cgls/cgls.c Auto-merging src/busctl/busctl.c CONFLICT (add/add): Merge conflict in src/busctl/busctl.c Auto-merging src/busctl/busctl-introspect.h CONFLICT (add/add): Merge conflict in src/busctl/busctl-introspect.h Auto-merging src/busctl/busctl-introspect.c CONFLICT (add/add): Merge conflict in src/busctl/busctl-introspect.c Auto-merging src/boot/efi/util.h CONFLICT (add/add): Merge conflict in src/boot/efi/util.h Auto-merging src/boot/efi/util.c CONFLICT (add/add): Merge conflict in src/boot/efi/util.c Auto-merging src/boot/efi/stub.c CONFLICT (add/add): Merge conflict in src/boot/efi/stub.c Auto-merging src/boot/efi/splash.h CONFLICT (add/add): Merge conflict in src/boot/efi/splash.h Auto-merging src/boot/efi/splash.c CONFLICT (add/add): Merge conflict in src/boot/efi/splash.c Auto-merging src/boot/efi/shim.h CONFLICT (add/add): Merge conflict in src/boot/efi/shim.h Auto-merging src/boot/efi/shim.c CONFLICT (add/add): Merge conflict in src/boot/efi/shim.c Auto-merging src/boot/efi/sha256.h CONFLICT (add/add): Merge conflict in src/boot/efi/sha256.h Auto-merging src/boot/efi/sha256.c CONFLICT (add/add): Merge conflict in src/boot/efi/sha256.c Auto-merging src/boot/efi/random-seed.h CONFLICT (add/add): Merge conflict in src/boot/efi/random-seed.h Auto-merging src/boot/efi/random-seed.c CONFLICT (add/add): Merge conflict in src/boot/efi/random-seed.c Auto-merging src/boot/efi/pe.h CONFLICT (add/add): Merge conflict in src/boot/efi/pe.h Auto-merging src/boot/efi/pe.c CONFLICT (add/add): Merge conflict in src/boot/efi/pe.c Auto-merging src/boot/efi/missing_efi.h CONFLICT (add/add): Merge conflict in src/boot/efi/missing_efi.h Auto-merging src/boot/efi/meson.build CONFLICT (add/add): Merge conflict in src/boot/efi/meson.build Auto-merging src/boot/efi/measure.h CONFLICT (add/add): Merge conflict in src/boot/efi/measure.h Auto-merging src/boot/efi/measure.c CONFLICT (add/add): Merge conflict in src/boot/efi/measure.c Auto-merging src/boot/efi/loader-features.h CONFLICT (add/add): Merge conflict in src/boot/efi/loader-features.h Auto-merging src/boot/efi/linux.h CONFLICT (add/add): Merge conflict in src/boot/efi/linux.h Auto-merging src/boot/efi/linux.c CONFLICT (add/add): Merge conflict in src/boot/efi/linux.c Auto-merging src/boot/efi/graphics.h CONFLICT (add/add): Merge conflict in src/boot/efi/graphics.h Auto-merging src/boot/efi/graphics.c CONFLICT (add/add): Merge conflict in src/boot/efi/graphics.c Auto-merging src/boot/efi/disk.h CONFLICT (add/add): Merge conflict in src/boot/efi/disk.h Auto-merging src/boot/efi/disk.c CONFLICT (add/add): Merge conflict in src/boot/efi/disk.c Auto-merging src/boot/efi/crc32.h CONFLICT (add/add): Merge conflict in src/boot/efi/crc32.h Auto-merging src/boot/efi/crc32.c CONFLICT (add/add): Merge conflict in src/boot/efi/crc32.c Auto-merging src/boot/efi/console.h CONFLICT (add/add): Merge conflict in src/boot/efi/console.h Auto-merging src/boot/efi/console.c CONFLICT (add/add): Merge conflict in src/boot/efi/console.c Auto-merging src/boot/efi/boot.c CONFLICT (add/add): Merge conflict in src/boot/efi/boot.c Auto-merging src/boot/bootctl.c CONFLICT (add/add): Merge conflict in src/boot/bootctl.c Auto-merging src/boot/boot-check-no-failures.c CONFLICT (add/add): Merge conflict in src/boot/boot-check-no-failures.c Auto-merging src/boot/bless-boot.c CONFLICT (add/add): Merge conflict in src/boot/bless-boot.c Auto-merging src/boot/bless-boot-generator.c CONFLICT (add/add): Merge conflict in src/boot/bless-boot-generator.c Auto-merging src/binfmt/binfmt.c CONFLICT (add/add): Merge conflict in src/binfmt/binfmt.c Auto-merging src/basic/xattr-util.h CONFLICT (add/add): Merge conflict in src/basic/xattr-util.h Auto-merging src/basic/xattr-util.c CONFLICT (add/add): Merge conflict in src/basic/xattr-util.c Auto-merging src/basic/virt.h CONFLICT (add/add): Merge conflict in src/basic/virt.h Auto-merging src/basic/virt.c CONFLICT (add/add): Merge conflict in src/basic/virt.c Auto-merging src/basic/util.h CONFLICT (add/add): Merge conflict in src/basic/util.h Auto-merging src/basic/util.c CONFLICT (add/add): Merge conflict in src/basic/util.c Auto-merging src/basic/utf8.h CONFLICT (add/add): Merge conflict in src/basic/utf8.h Auto-merging src/basic/utf8.c CONFLICT (add/add): Merge conflict in src/basic/utf8.c Auto-merging src/basic/user-util.h CONFLICT (add/add): Merge conflict in src/basic/user-util.h Auto-merging src/basic/user-util.c CONFLICT (add/add): Merge conflict in src/basic/user-util.c Auto-merging src/basic/unit-name.h CONFLICT (add/add): Merge conflict in src/basic/unit-name.h Auto-merging src/basic/unit-name.c CONFLICT (add/add): Merge conflict in src/basic/unit-name.c Auto-merging src/basic/unit-def.h CONFLICT (add/add): Merge conflict in src/basic/unit-def.h Auto-merging src/basic/unit-def.c CONFLICT (add/add): Merge conflict in src/basic/unit-def.c Auto-merging src/basic/unaligned.h CONFLICT (add/add): Merge conflict in src/basic/unaligned.h Auto-merging src/basic/umask-util.h CONFLICT (add/add): Merge conflict in src/basic/umask-util.h Auto-merging src/basic/tmpfile-util.h CONFLICT (add/add): Merge conflict in src/basic/tmpfile-util.h Auto-merging src/basic/tmpfile-util.c CONFLICT (add/add): Merge conflict in src/basic/tmpfile-util.c Auto-merging src/basic/time-util.h CONFLICT (add/add): Merge conflict in src/basic/time-util.h Auto-merging src/basic/time-util.c CONFLICT (add/add): Merge conflict in src/basic/time-util.c Auto-merging src/basic/terminal-util.h CONFLICT (add/add): Merge conflict in src/basic/terminal-util.h Auto-merging src/basic/terminal-util.c CONFLICT (add/add): Merge conflict in src/basic/terminal-util.c Auto-merging src/basic/syslog-util.h CONFLICT (add/add): Merge conflict in src/basic/syslog-util.h Auto-merging src/basic/syslog-util.c CONFLICT (add/add): Merge conflict in src/basic/syslog-util.c Auto-merging src/basic/strxcpyx.h CONFLICT (add/add): Merge conflict in src/basic/strxcpyx.h Auto-merging src/basic/strxcpyx.c CONFLICT (add/add): Merge conflict in src/basic/strxcpyx.c Auto-merging src/basic/strv.h CONFLICT (add/add): Merge conflict in src/basic/strv.h Auto-merging src/basic/strv.c CONFLICT (add/add): Merge conflict in src/basic/strv.c Auto-merging src/basic/string-util.h CONFLICT (add/add): Merge conflict in src/basic/string-util.h Auto-merging src/basic/string-util.c CONFLICT (add/add): Merge conflict in src/basic/string-util.c Auto-merging src/basic/string-table.h CONFLICT (add/add): Merge conflict in src/basic/string-table.h Auto-merging src/basic/string-table.c CONFLICT (add/add): Merge conflict in src/basic/string-table.c Auto-merging src/basic/strbuf.h CONFLICT (add/add): Merge conflict in src/basic/strbuf.h Auto-merging src/basic/strbuf.c CONFLICT (add/add): Merge conflict in src/basic/strbuf.c Auto-merging src/basic/stdio-util.h CONFLICT (add/add): Merge conflict in src/basic/stdio-util.h Auto-merging src/basic/static-destruct.h CONFLICT (add/add): Merge conflict in src/basic/static-destruct.h Auto-merging src/basic/stat-util.h CONFLICT (add/add): Merge conflict in src/basic/stat-util.h Auto-merging src/basic/stat-util.c CONFLICT (add/add): Merge conflict in src/basic/stat-util.c Auto-merging src/basic/special.h CONFLICT (add/add): Merge conflict in src/basic/special.h Auto-merging src/basic/sort-util.h CONFLICT (add/add): Merge conflict in src/basic/sort-util.h Auto-merging src/basic/sort-util.c CONFLICT (add/add): Merge conflict in src/basic/sort-util.c Auto-merging src/basic/socket-util.h CONFLICT (add/add): Merge conflict in src/basic/socket-util.h Auto-merging src/basic/socket-util.c CONFLICT (add/add): Merge conflict in src/basic/socket-util.c Auto-merging src/basic/socket-label.c CONFLICT (add/add): Merge conflict in src/basic/socket-label.c Auto-merging src/basic/smack-util.h CONFLICT (add/add): Merge conflict in src/basic/smack-util.h Auto-merging src/basic/smack-util.c CONFLICT (add/add): Merge conflict in src/basic/smack-util.c Auto-merging src/basic/siphash24.h CONFLICT (add/add): Merge conflict in src/basic/siphash24.h Auto-merging src/basic/siphash24.c CONFLICT (add/add): Merge conflict in src/basic/siphash24.c Auto-merging src/basic/signal-util.h CONFLICT (add/add): Merge conflict in src/basic/signal-util.h Auto-merging src/basic/signal-util.c CONFLICT (add/add): Merge conflict in src/basic/signal-util.c Auto-merging src/basic/sigbus.h CONFLICT (add/add): Merge conflict in src/basic/sigbus.h Auto-merging src/basic/sigbus.c CONFLICT (add/add): Merge conflict in src/basic/sigbus.c Auto-merging src/basic/set.h CONFLICT (add/add): Merge conflict in src/basic/set.h Auto-merging src/basic/selinux-util.h CONFLICT (add/add): Merge conflict in src/basic/selinux-util.h Auto-merging src/basic/selinux-util.c CONFLICT (add/add): Merge conflict in src/basic/selinux-util.c Auto-merging src/basic/rm-rf.h CONFLICT (add/add): Merge conflict in src/basic/rm-rf.h Auto-merging src/basic/rm-rf.c CONFLICT (add/add): Merge conflict in src/basic/rm-rf.c Auto-merging src/basic/rlimit-util.h CONFLICT (add/add): Merge conflict in src/basic/rlimit-util.h Auto-merging src/basic/rlimit-util.c CONFLICT (add/add): Merge conflict in src/basic/rlimit-util.c Auto-merging src/basic/replace-var.h CONFLICT (add/add): Merge conflict in src/basic/replace-var.h Auto-merging src/basic/replace-var.c CONFLICT (add/add): Merge conflict in src/basic/replace-var.c Auto-merging src/basic/raw-reboot.h CONFLICT (add/add): Merge conflict in src/basic/raw-reboot.h Auto-merging src/basic/raw-clone.h CONFLICT (add/add): Merge conflict in src/basic/raw-clone.h Auto-merging src/basic/ratelimit.h CONFLICT (add/add): Merge conflict in src/basic/ratelimit.h Auto-merging src/basic/ratelimit.c CONFLICT (add/add): Merge conflict in src/basic/ratelimit.c Auto-merging src/basic/random-util.h CONFLICT (add/add): Merge conflict in src/basic/random-util.h Auto-merging src/basic/random-util.c CONFLICT (add/add): Merge conflict in src/basic/random-util.c Auto-merging src/basic/quota-util.h CONFLICT (add/add): Merge conflict in src/basic/quota-util.h Auto-merging src/basic/quota-util.c CONFLICT (add/add): Merge conflict in src/basic/quota-util.c Auto-merging src/basic/pthread-util.h CONFLICT (add/add): Merge conflict in src/basic/pthread-util.h Auto-merging src/basic/procfs-util.h CONFLICT (add/add): Merge conflict in src/basic/procfs-util.h Auto-merging src/basic/procfs-util.c CONFLICT (add/add): Merge conflict in src/basic/procfs-util.c Auto-merging src/basic/process-util.h CONFLICT (add/add): Merge conflict in src/basic/process-util.h Auto-merging src/basic/process-util.c CONFLICT (add/add): Merge conflict in src/basic/process-util.c Auto-merging src/basic/proc-cmdline.h CONFLICT (add/add): Merge conflict in src/basic/proc-cmdline.h Auto-merging src/basic/proc-cmdline.c CONFLICT (add/add): Merge conflict in src/basic/proc-cmdline.c Auto-merging src/basic/prioq.h CONFLICT (add/add): Merge conflict in src/basic/prioq.h Auto-merging src/basic/prioq.c CONFLICT (add/add): Merge conflict in src/basic/prioq.c Auto-merging src/basic/path-util.h CONFLICT (add/add): Merge conflict in src/basic/path-util.h Auto-merging src/basic/path-util.c CONFLICT (add/add): Merge conflict in src/basic/path-util.c Auto-merging src/basic/path-lookup.h CONFLICT (add/add): Merge conflict in src/basic/path-lookup.h Auto-merging src/basic/path-lookup.c CONFLICT (add/add): Merge conflict in src/basic/path-lookup.c Auto-merging src/basic/parse-util.h CONFLICT (add/add): Merge conflict in src/basic/parse-util.h Auto-merging src/basic/parse-util.c CONFLICT (add/add): Merge conflict in src/basic/parse-util.c Auto-merging src/basic/ordered-set.h CONFLICT (add/add): Merge conflict in src/basic/ordered-set.h Auto-merging src/basic/ordered-set.c CONFLICT (add/add): Merge conflict in src/basic/ordered-set.c Auto-merging src/basic/nulstr-util.h CONFLICT (add/add): Merge conflict in src/basic/nulstr-util.h Auto-merging src/basic/nulstr-util.c CONFLICT (add/add): Merge conflict in src/basic/nulstr-util.c Auto-merging src/basic/nss-util.h CONFLICT (add/add): Merge conflict in src/basic/nss-util.h Auto-merging src/basic/namespace-util.h CONFLICT (add/add): Merge conflict in src/basic/namespace-util.h Auto-merging src/basic/namespace-util.c CONFLICT (add/add): Merge conflict in src/basic/namespace-util.c Auto-merging src/basic/mountpoint-util.h CONFLICT (add/add): Merge conflict in src/basic/mountpoint-util.h Auto-merging src/basic/mountpoint-util.c CONFLICT (add/add): Merge conflict in src/basic/mountpoint-util.c Auto-merging src/basic/mkdir.h CONFLICT (add/add): Merge conflict in src/basic/mkdir.h Auto-merging src/basic/mkdir.c CONFLICT (add/add): Merge conflict in src/basic/mkdir.c Auto-merging src/basic/mkdir-label.c CONFLICT (add/add): Merge conflict in src/basic/mkdir-label.c Auto-merging src/basic/missing_xfs.h CONFLICT (add/add): Merge conflict in src/basic/missing_xfs.h Auto-merging src/basic/missing_type.h CONFLICT (add/add): Merge conflict in src/basic/missing_type.h Auto-merging src/basic/missing_timerfd.h CONFLICT (add/add): Merge conflict in src/basic/missing_timerfd.h Auto-merging src/basic/missing_syscall.h CONFLICT (add/add): Merge conflict in src/basic/missing_syscall.h Auto-merging src/basic/missing_stdlib.h CONFLICT (add/add): Merge conflict in src/basic/missing_stdlib.h Auto-merging src/basic/missing_stat.h CONFLICT (add/add): Merge conflict in src/basic/missing_stat.h Auto-merging src/basic/missing_socket.h CONFLICT (add/add): Merge conflict in src/basic/missing_socket.h Auto-merging src/basic/missing_sched.h CONFLICT (add/add): Merge conflict in src/basic/missing_sched.h Auto-merging src/basic/missing_resource.h CONFLICT (add/add): Merge conflict in src/basic/missing_resource.h Auto-merging src/basic/missing_random.h CONFLICT (add/add): Merge conflict in src/basic/missing_random.h Auto-merging src/basic/missing_prctl.h CONFLICT (add/add): Merge conflict in src/basic/missing_prctl.h Auto-merging src/basic/missing_network.h CONFLICT (add/add): Merge conflict in src/basic/missing_network.h Auto-merging src/basic/missing_mman.h CONFLICT (add/add): Merge conflict in src/basic/missing_mman.h Auto-merging src/basic/missing_magic.h CONFLICT (add/add): Merge conflict in src/basic/missing_magic.h Auto-merging src/basic/missing_keyctl.h CONFLICT (add/add): Merge conflict in src/basic/missing_keyctl.h Auto-merging src/basic/missing_input.h CONFLICT (add/add): Merge conflict in src/basic/missing_input.h Auto-merging src/basic/missing_fs.h CONFLICT (add/add): Merge conflict in src/basic/missing_fs.h Auto-merging src/basic/missing_fcntl.h CONFLICT (add/add): Merge conflict in src/basic/missing_fcntl.h Auto-merging src/basic/missing_drm.h CONFLICT (add/add): Merge conflict in src/basic/missing_drm.h Auto-merging src/basic/missing_capability.h CONFLICT (add/add): Merge conflict in src/basic/missing_capability.h Auto-merging src/basic/missing_audit.h CONFLICT (add/add): Merge conflict in src/basic/missing_audit.h Auto-merging src/basic/meson.build CONFLICT (add/add): Merge conflict in src/basic/meson.build Auto-merging src/basic/mempool.h CONFLICT (add/add): Merge conflict in src/basic/mempool.h Auto-merging src/basic/mempool.c CONFLICT (add/add): Merge conflict in src/basic/mempool.c Auto-merging src/basic/memory-util.h CONFLICT (add/add): Merge conflict in src/basic/memory-util.h Auto-merging src/basic/memory-util.c CONFLICT (add/add): Merge conflict in src/basic/memory-util.c Auto-merging src/basic/memfd-util.h CONFLICT (add/add): Merge conflict in src/basic/memfd-util.h Auto-merging src/basic/memfd-util.c CONFLICT (add/add): Merge conflict in src/basic/memfd-util.c Auto-merging src/basic/macro.h CONFLICT (add/add): Merge conflict in src/basic/macro.h Auto-merging src/basic/login-util.h CONFLICT (add/add): Merge conflict in src/basic/login-util.h Auto-merging src/basic/login-util.c CONFLICT (add/add): Merge conflict in src/basic/login-util.c Auto-merging src/basic/log.h CONFLICT (add/add): Merge conflict in src/basic/log.h Auto-merging src/basic/log.c CONFLICT (add/add): Merge conflict in src/basic/log.c Auto-merging src/basic/locale-util.h CONFLICT (add/add): Merge conflict in src/basic/locale-util.h Auto-merging src/basic/locale-util.c CONFLICT (add/add): Merge conflict in src/basic/locale-util.c Auto-merging src/basic/list.h CONFLICT (add/add): Merge conflict in src/basic/list.h Auto-merging src/basic/linux/update.sh CONFLICT (add/add): Merge conflict in src/basic/linux/update.sh Auto-merging src/basic/linux/rtnetlink.h CONFLICT (add/add): Merge conflict in src/basic/linux/rtnetlink.h Auto-merging src/basic/linux/pkt_sched.h CONFLICT (add/add): Merge conflict in src/basic/linux/pkt_sched.h Auto-merging src/basic/linux/nexthop.h CONFLICT (add/add): Merge conflict in src/basic/linux/nexthop.h Auto-merging src/basic/linux/netlink.h CONFLICT (add/add): Merge conflict in src/basic/linux/netlink.h Auto-merging src/basic/linux/in6.h CONFLICT (add/add): Merge conflict in src/basic/linux/in6.h Auto-merging src/basic/linux/in.h CONFLICT (add/add): Merge conflict in src/basic/linux/in.h Auto-merging src/basic/linux/if_macsec.h CONFLICT (add/add): Merge conflict in src/basic/linux/if_macsec.h Auto-merging src/basic/linux/if_link.h CONFLICT (add/add): Merge conflict in src/basic/linux/if_link.h Auto-merging src/basic/linux/if_ether.h CONFLICT (add/add): Merge conflict in src/basic/linux/if_ether.h Auto-merging src/basic/linux/if_bridge.h CONFLICT (add/add): Merge conflict in src/basic/linux/if_bridge.h Auto-merging src/basic/linux/if.h CONFLICT (add/add): Merge conflict in src/basic/linux/if.h Auto-merging src/basic/linux/btrfs_tree.h CONFLICT (add/add): Merge conflict in src/basic/linux/btrfs_tree.h Auto-merging src/basic/linux/btrfs.h CONFLICT (add/add): Merge conflict in src/basic/linux/btrfs.h Auto-merging src/basic/limits-util.h CONFLICT (add/add): Merge conflict in src/basic/limits-util.h Auto-merging src/basic/limits-util.c CONFLICT (add/add): Merge conflict in src/basic/limits-util.c Auto-merging src/basic/label.h CONFLICT (add/add): Merge conflict in src/basic/label.h Auto-merging src/basic/label.c CONFLICT (add/add): Merge conflict in src/basic/label.c Auto-merging src/basic/khash.h CONFLICT (add/add): Merge conflict in src/basic/khash.h Auto-merging src/basic/khash.c CONFLICT (add/add): Merge conflict in src/basic/khash.c Auto-merging src/basic/kbd-util.h CONFLICT (add/add): Merge conflict in src/basic/kbd-util.h Auto-merging src/basic/kbd-util.c CONFLICT (add/add): Merge conflict in src/basic/kbd-util.c Auto-merging src/basic/io-util.h CONFLICT (add/add): Merge conflict in src/basic/io-util.h Auto-merging src/basic/io-util.c CONFLICT (add/add): Merge conflict in src/basic/io-util.c Auto-merging src/basic/in-addr-util.h CONFLICT (add/add): Merge conflict in src/basic/in-addr-util.h Auto-merging src/basic/in-addr-util.c CONFLICT (add/add): Merge conflict in src/basic/in-addr-util.c Auto-merging src/basic/hostname-util.h CONFLICT (add/add): Merge conflict in src/basic/hostname-util.h Auto-merging src/basic/hostname-util.c CONFLICT (add/add): Merge conflict in src/basic/hostname-util.c Auto-merging src/basic/hexdecoct.h CONFLICT (add/add): Merge conflict in src/basic/hexdecoct.h Auto-merging src/basic/hexdecoct.c CONFLICT (add/add): Merge conflict in src/basic/hexdecoct.c Auto-merging src/basic/hashmap.h CONFLICT (add/add): Merge conflict in src/basic/hashmap.h Auto-merging src/basic/hashmap.c CONFLICT (add/add): Merge conflict in src/basic/hashmap.c Auto-merging src/basic/hash-funcs.h CONFLICT (add/add): Merge conflict in src/basic/hash-funcs.h Auto-merging src/basic/hash-funcs.c CONFLICT (add/add): Merge conflict in src/basic/hash-funcs.c Auto-merging src/basic/gunicode.h CONFLICT (add/add): Merge conflict in src/basic/gunicode.h Auto-merging src/basic/gunicode.c CONFLICT (add/add): Merge conflict in src/basic/gunicode.c Auto-merging src/basic/glob-util.h CONFLICT (add/add): Merge conflict in src/basic/glob-util.h Auto-merging src/basic/glob-util.c CONFLICT (add/add): Merge conflict in src/basic/glob-util.c Auto-merging src/basic/gcrypt-util.h CONFLICT (add/add): Merge conflict in src/basic/gcrypt-util.h Auto-merging src/basic/gcrypt-util.c CONFLICT (add/add): Merge conflict in src/basic/gcrypt-util.c Auto-merging src/basic/fs-util.h CONFLICT (add/add): Merge conflict in src/basic/fs-util.h Auto-merging src/basic/fs-util.c CONFLICT (add/add): Merge conflict in src/basic/fs-util.c Auto-merging src/basic/format-util.h CONFLICT (add/add): Merge conflict in src/basic/format-util.h Auto-merging src/basic/format-util.c CONFLICT (add/add): Merge conflict in src/basic/format-util.c Auto-merging src/basic/fileio.h CONFLICT (add/add): Merge conflict in src/basic/fileio.h Auto-merging src/basic/fileio.c CONFLICT (add/add): Merge conflict in src/basic/fileio.c Auto-merging src/basic/fd-util.h CONFLICT (add/add): Merge conflict in src/basic/fd-util.h Auto-merging src/basic/fd-util.c CONFLICT (add/add): Merge conflict in src/basic/fd-util.c Auto-merging src/basic/extract-word.h CONFLICT (add/add): Merge conflict in src/basic/extract-word.h Auto-merging src/basic/extract-word.c CONFLICT (add/add): Merge conflict in src/basic/extract-word.c Auto-merging src/basic/ether-addr-util.h CONFLICT (add/add): Merge conflict in src/basic/ether-addr-util.h Auto-merging src/basic/ether-addr-util.c CONFLICT (add/add): Merge conflict in src/basic/ether-addr-util.c Auto-merging src/basic/escape.h CONFLICT (add/add): Merge conflict in src/basic/escape.h Auto-merging src/basic/escape.c CONFLICT (add/add): Merge conflict in src/basic/escape.c Auto-merging src/basic/errno-util.h CONFLICT (add/add): Merge conflict in src/basic/errno-util.h Auto-merging src/basic/errno-list.h CONFLICT (add/add): Merge conflict in src/basic/errno-list.h Auto-merging src/basic/errno-list.c CONFLICT (add/add): Merge conflict in src/basic/errno-list.c Auto-merging src/basic/env-util.h CONFLICT (add/add): Merge conflict in src/basic/env-util.h Auto-merging src/basic/env-util.c CONFLICT (add/add): Merge conflict in src/basic/env-util.c Auto-merging src/basic/env-file.h CONFLICT (add/add): Merge conflict in src/basic/env-file.h Auto-merging src/basic/env-file.c CONFLICT (add/add): Merge conflict in src/basic/env-file.c Auto-merging src/basic/efivars.h CONFLICT (add/add): Merge conflict in src/basic/efivars.h Auto-merging src/basic/efivars.c CONFLICT (add/add): Merge conflict in src/basic/efivars.c Auto-merging src/basic/dirent-util.h CONFLICT (add/add): Merge conflict in src/basic/dirent-util.h Auto-merging src/basic/dirent-util.c CONFLICT (add/add): Merge conflict in src/basic/dirent-util.c Auto-merging src/basic/device-nodes.h CONFLICT (add/add): Merge conflict in src/basic/device-nodes.h Auto-merging src/basic/device-nodes.c CONFLICT (add/add): Merge conflict in src/basic/device-nodes.c Auto-merging src/basic/def.h CONFLICT (add/add): Merge conflict in src/basic/def.h Auto-merging src/basic/copy.h CONFLICT (add/add): Merge conflict in src/basic/copy.h Auto-merging src/basic/copy.c CONFLICT (add/add): Merge conflict in src/basic/copy.c Auto-merging src/basic/conf-files.h CONFLICT (add/add): Merge conflict in src/basic/conf-files.h Auto-merging src/basic/conf-files.c CONFLICT (add/add): Merge conflict in src/basic/conf-files.c Auto-merging src/basic/chattr-util.h CONFLICT (add/add): Merge conflict in src/basic/chattr-util.h Auto-merging src/basic/chattr-util.c CONFLICT (add/add): Merge conflict in src/basic/chattr-util.c Auto-merging src/basic/cgroup-util.h CONFLICT (add/add): Merge conflict in src/basic/cgroup-util.h Auto-merging src/basic/cgroup-util.c CONFLICT (add/add): Merge conflict in src/basic/cgroup-util.c Auto-merging src/basic/capability-util.h CONFLICT (add/add): Merge conflict in src/basic/capability-util.h Auto-merging src/basic/capability-util.c CONFLICT (add/add): Merge conflict in src/basic/capability-util.c Auto-merging src/basic/cap-list.h CONFLICT (add/add): Merge conflict in src/basic/cap-list.h Auto-merging src/basic/cap-list.c CONFLICT (add/add): Merge conflict in src/basic/cap-list.c Auto-merging src/basic/bus-label.h CONFLICT (add/add): Merge conflict in src/basic/bus-label.h Auto-merging src/basic/bus-label.c CONFLICT (add/add): Merge conflict in src/basic/bus-label.c Auto-merging src/basic/build.h CONFLICT (add/add): Merge conflict in src/basic/build.h Auto-merging src/basic/btrfs-util.h CONFLICT (add/add): Merge conflict in src/basic/btrfs-util.h Auto-merging src/basic/btrfs-util.c CONFLICT (add/add): Merge conflict in src/basic/btrfs-util.c Auto-merging src/basic/blockdev-util.h CONFLICT (add/add): Merge conflict in src/basic/blockdev-util.h Auto-merging src/basic/blockdev-util.c CONFLICT (add/add): Merge conflict in src/basic/blockdev-util.c Auto-merging src/basic/audit-util.h CONFLICT (add/add): Merge conflict in src/basic/audit-util.h Auto-merging src/basic/audit-util.c CONFLICT (add/add): Merge conflict in src/basic/audit-util.c Auto-merging src/basic/async.h CONFLICT (add/add): Merge conflict in src/basic/async.h Auto-merging src/basic/async.c CONFLICT (add/add): Merge conflict in src/basic/async.c Auto-merging src/basic/arphrd-list.h CONFLICT (add/add): Merge conflict in src/basic/arphrd-list.h Auto-merging src/basic/arphrd-list.c CONFLICT (add/add): Merge conflict in src/basic/arphrd-list.c Auto-merging src/basic/architecture.h CONFLICT (add/add): Merge conflict in src/basic/architecture.h Auto-merging src/basic/architecture.c CONFLICT (add/add): Merge conflict in src/basic/architecture.c Auto-merging src/basic/alloc-util.h CONFLICT (add/add): Merge conflict in src/basic/alloc-util.h Auto-merging src/basic/alloc-util.c CONFLICT (add/add): Merge conflict in src/basic/alloc-util.c Auto-merging src/basic/af-list.h CONFLICT (add/add): Merge conflict in src/basic/af-list.h Auto-merging src/basic/af-list.c CONFLICT (add/add): Merge conflict in src/basic/af-list.c Auto-merging src/basic/MurmurHash2.h CONFLICT (add/add): Merge conflict in src/basic/MurmurHash2.h Auto-merging src/basic/MurmurHash2.c CONFLICT (add/add): Merge conflict in src/basic/MurmurHash2.c Auto-merging src/backlight/backlight.c CONFLICT (add/add): Merge conflict in src/backlight/backlight.c Auto-merging src/ask-password/ask-password.c CONFLICT (add/add): Merge conflict in src/ask-password/ask-password.c Auto-merging src/analyze/test-verify.c CONFLICT (add/add): Merge conflict in src/analyze/test-verify.c Auto-merging src/analyze/meson.build CONFLICT (add/add): Merge conflict in src/analyze/meson.build Auto-merging src/analyze/analyze.c CONFLICT (add/add): Merge conflict in src/analyze/analyze.c Auto-merging src/analyze/analyze-verify.h CONFLICT (add/add): Merge conflict in src/analyze/analyze-verify.h Auto-merging src/analyze/analyze-verify.c CONFLICT (add/add): Merge conflict in src/analyze/analyze-verify.c Auto-merging src/analyze/analyze-security.h CONFLICT (add/add): Merge conflict in src/analyze/analyze-security.h Auto-merging src/analyze/analyze-security.c CONFLICT (add/add): Merge conflict in src/analyze/analyze-security.c Auto-merging src/analyze/analyze-condition.h CONFLICT (add/add): Merge conflict in src/analyze/analyze-condition.h Auto-merging src/analyze/analyze-condition.c CONFLICT (add/add): Merge conflict in src/analyze/analyze-condition.c Auto-merging src/activate/activate.c CONFLICT (add/add): Merge conflict in src/activate/activate.c Auto-merging src/ac-power/ac-power.c CONFLICT (add/add): Merge conflict in src/ac-power/ac-power.c Auto-merging shell-completion/zsh/meson.build CONFLICT (add/add): Merge conflict in shell-completion/zsh/meson.build Auto-merging shell-completion/zsh/_udevadm CONFLICT (add/add): Merge conflict in shell-completion/zsh/_udevadm Auto-merging shell-completion/zsh/_timedatectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_timedatectl Auto-merging shell-completion/zsh/_systemd-tmpfiles CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-tmpfiles Auto-merging shell-completion/zsh/_systemd-run CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-run Auto-merging shell-completion/zsh/_systemd-nspawn CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-nspawn Auto-merging shell-completion/zsh/_systemd-inhibit CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-inhibit Auto-merging shell-completion/zsh/_systemd-delta CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-delta Auto-merging shell-completion/zsh/_systemd-analyze CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd-analyze Auto-merging shell-completion/zsh/_systemd CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemd Auto-merging shell-completion/zsh/_systemctl.in CONFLICT (add/add): Merge conflict in shell-completion/zsh/_systemctl.in Auto-merging shell-completion/zsh/_sd_unit_files CONFLICT (add/add): Merge conflict in shell-completion/zsh/_sd_unit_files Auto-merging shell-completion/zsh/_sd_outputmodes CONFLICT (add/add): Merge conflict in shell-completion/zsh/_sd_outputmodes Auto-merging shell-completion/zsh/_sd_machines CONFLICT (add/add): Merge conflict in shell-completion/zsh/_sd_machines Auto-merging shell-completion/zsh/_sd_hosts_or_user_at_host CONFLICT (add/add): Merge conflict in shell-completion/zsh/_sd_hosts_or_user_at_host Auto-merging shell-completion/zsh/_resolvectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_resolvectl Auto-merging shell-completion/zsh/_networkctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_networkctl Auto-merging shell-completion/zsh/_machinectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_machinectl Auto-merging shell-completion/zsh/_loginctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_loginctl Auto-merging shell-completion/zsh/_localectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_localectl Auto-merging shell-completion/zsh/_kernel-install CONFLICT (add/add): Merge conflict in shell-completion/zsh/_kernel-install Auto-merging shell-completion/zsh/_journalctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_journalctl Auto-merging shell-completion/zsh/_hostnamectl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_hostnamectl Auto-merging shell-completion/zsh/_coredumpctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_coredumpctl Auto-merging shell-completion/zsh/_busctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_busctl Auto-merging shell-completion/zsh/_bootctl CONFLICT (add/add): Merge conflict in shell-completion/zsh/_bootctl Auto-merging shell-completion/bash/udevadm CONFLICT (add/add): Merge conflict in shell-completion/bash/udevadm Auto-merging shell-completion/bash/timedatectl CONFLICT (add/add): Merge conflict in shell-completion/bash/timedatectl Auto-merging shell-completion/bash/systemd-run CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-run Auto-merging shell-completion/bash/systemd-resolve CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-resolve Auto-merging shell-completion/bash/systemd-path CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-path Auto-merging shell-completion/bash/systemd-nspawn CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-nspawn Auto-merging shell-completion/bash/systemd-id128 CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-id128 Auto-merging shell-completion/bash/systemd-detect-virt CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-detect-virt Auto-merging shell-completion/bash/systemd-delta CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-delta Auto-merging shell-completion/bash/systemd-cgtop CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-cgtop Auto-merging shell-completion/bash/systemd-cgls CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-cgls Auto-merging shell-completion/bash/systemd-cat CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-cat Auto-merging shell-completion/bash/systemd-analyze CONFLICT (add/add): Merge conflict in shell-completion/bash/systemd-analyze Auto-merging shell-completion/bash/systemctl.in CONFLICT (add/add): Merge conflict in shell-completion/bash/systemctl.in Auto-merging shell-completion/bash/resolvectl CONFLICT (add/add): Merge conflict in shell-completion/bash/resolvectl Auto-merging shell-completion/bash/portablectl CONFLICT (add/add): Merge conflict in shell-completion/bash/portablectl Auto-merging shell-completion/bash/networkctl CONFLICT (add/add): Merge conflict in shell-completion/bash/networkctl Auto-merging shell-completion/bash/meson.build CONFLICT (add/add): Merge conflict in shell-completion/bash/meson.build Auto-merging shell-completion/bash/machinectl CONFLICT (add/add): Merge conflict in shell-completion/bash/machinectl Auto-merging shell-completion/bash/loginctl CONFLICT (add/add): Merge conflict in shell-completion/bash/loginctl Auto-merging shell-completion/bash/localectl CONFLICT (add/add): Merge conflict in shell-completion/bash/localectl Auto-merging shell-completion/bash/kernel-install CONFLICT (add/add): Merge conflict in shell-completion/bash/kernel-install Auto-merging shell-completion/bash/journalctl CONFLICT (add/add): Merge conflict in shell-completion/bash/journalctl Auto-merging shell-completion/bash/hostnamectl CONFLICT (add/add): Merge conflict in shell-completion/bash/hostnamectl Auto-merging shell-completion/bash/coredumpctl CONFLICT (add/add): Merge conflict in shell-completion/bash/coredumpctl Auto-merging shell-completion/bash/busctl CONFLICT (add/add): Merge conflict in shell-completion/bash/busctl Auto-merging shell-completion/bash/bootctl CONFLICT (add/add): Merge conflict in shell-completion/bash/bootctl Auto-merging semaphoreci/semaphore-runner.sh CONFLICT (add/add): Merge conflict in semaphoreci/semaphore-runner.sh Auto-merging rules.d/meson.build CONFLICT (add/add): Merge conflict in rules.d/meson.build Auto-merging rules.d/99-systemd.rules.in CONFLICT (add/add): Merge conflict in rules.d/99-systemd.rules.in Auto-merging rules.d/80-net-setup-link.rules CONFLICT (add/add): Merge conflict in rules.d/80-net-setup-link.rules Auto-merging rules.d/60-serial.rules CONFLICT (add/add): Merge conflict in rules.d/60-serial.rules Auto-merging rules.d/60-persistent-storage.rules CONFLICT (add/add): Merge conflict in rules.d/60-persistent-storage.rules Auto-merging rules.d/60-fido-id.rules CONFLICT (add/add): Merge conflict in rules.d/60-fido-id.rules Auto-merging rules.d/50-udev-default.rules.in CONFLICT (add/add): Merge conflict in rules.d/50-udev-default.rules.in Auto-merging presets/user/90-systemd.preset CONFLICT (add/add): Merge conflict in presets/user/90-systemd.preset Auto-merging presets/meson.build CONFLICT (add/add): Merge conflict in presets/meson.build Auto-merging presets/90-systemd.preset CONFLICT (add/add): Merge conflict in presets/90-systemd.preset Auto-merging po/zh_TW.po CONFLICT (add/add): Merge conflict in po/zh_TW.po Auto-merging po/zh_CN.po CONFLICT (add/add): Merge conflict in po/zh_CN.po Auto-merging po/uk.po CONFLICT (add/add): Merge conflict in po/uk.po Auto-merging po/tr.po CONFLICT (add/add): Merge conflict in po/tr.po Auto-merging po/sv.po CONFLICT (add/add): Merge conflict in po/sv.po Auto-merging po/sr.po CONFLICT (add/add): Merge conflict in po/sr.po Auto-merging po/sk.po CONFLICT (add/add): Merge conflict in po/sk.po Auto-merging po/ru.po CONFLICT (add/add): Merge conflict in po/ru.po Auto-merging po/ro.po CONFLICT (add/add): Merge conflict in po/ro.po Auto-merging po/pt_BR.po CONFLICT (add/add): Merge conflict in po/pt_BR.po Auto-merging po/pl.po CONFLICT (add/add): Merge conflict in po/pl.po Auto-merging po/meson.build CONFLICT (add/add): Merge conflict in po/meson.build Auto-merging po/lt.po CONFLICT (add/add): Merge conflict in po/lt.po Auto-merging po/ko.po CONFLICT (add/add): Merge conflict in po/ko.po Auto-merging po/ja.po CONFLICT (add/add): Merge conflict in po/ja.po Auto-merging po/it.po CONFLICT (add/add): Merge conflict in po/it.po Auto-merging po/id.po CONFLICT (add/add): Merge conflict in po/id.po Auto-merging po/hu.po CONFLICT (add/add): Merge conflict in po/hu.po Auto-merging po/hr.po CONFLICT (add/add): Merge conflict in po/hr.po Auto-merging po/gl.po CONFLICT (add/add): Merge conflict in po/gl.po Auto-merging po/fr.po CONFLICT (add/add): Merge conflict in po/fr.po Auto-merging po/es.po CONFLICT (add/add): Merge conflict in po/es.po Auto-merging po/el.po CONFLICT (add/add): Merge conflict in po/el.po Auto-merging po/de.po CONFLICT (add/add): Merge conflict in po/de.po Auto-merging po/da.po CONFLICT (add/add): Merge conflict in po/da.po Auto-merging po/cs.po CONFLICT (add/add): Merge conflict in po/cs.po Auto-merging po/ca.po CONFLICT (add/add): Merge conflict in po/ca.po Auto-merging po/bg.po CONFLICT (add/add): Merge conflict in po/bg.po Auto-merging po/be@latin.po CONFLICT (add/add): Merge conflict in po/be@latin.po Auto-merging po/be.po CONFLICT (add/add): Merge conflict in po/be.po Auto-merging po/POTFILES.skip CONFLICT (add/add): Merge conflict in po/POTFILES.skip Auto-merging po/POTFILES.in CONFLICT (add/add): Merge conflict in po/POTFILES.in Auto-merging network/meson.build CONFLICT (add/add): Merge conflict in network/meson.build Auto-merging network/99-default.link CONFLICT (add/add): Merge conflict in network/99-default.link Auto-merging network/80-vm-vt.network CONFLICT (add/add): Merge conflict in network/80-vm-vt.network Auto-merging network/80-container-vz.network CONFLICT (add/add): Merge conflict in network/80-container-vz.network Auto-merging network/80-container-ve.network CONFLICT (add/add): Merge conflict in network/80-container-ve.network Auto-merging network/80-container-host0.network CONFLICT (add/add): Merge conflict in network/80-container-host0.network Auto-merging modprobe.d/systemd.conf CONFLICT (add/add): Merge conflict in modprobe.d/systemd.conf Auto-merging meson_options.txt CONFLICT (add/add): Merge conflict in meson_options.txt Auto-merging meson.build CONFLICT (add/add): Merge conflict in meson.build Auto-merging man/vconsole.conf.xml CONFLICT (add/add): Merge conflict in man/vconsole.conf.xml Auto-merging man/userdbctl.xml CONFLICT (add/add): Merge conflict in man/userdbctl.xml Auto-merging man/user@.service.xml CONFLICT (add/add): Merge conflict in man/user@.service.xml Auto-merging man/user-system-options.xml CONFLICT (add/add): Merge conflict in man/user-system-options.xml Auto-merging man/udevadm.xml CONFLICT (add/add): Merge conflict in man/udevadm.xml Auto-merging man/udev_new.xml CONFLICT (add/add): Merge conflict in man/udev_new.xml Auto-merging man/udev_monitor_receive_device.xml CONFLICT (add/add): Merge conflict in man/udev_monitor_receive_device.xml Auto-merging man/udev_monitor_new_from_netlink.xml CONFLICT (add/add): Merge conflict in man/udev_monitor_new_from_netlink.xml Auto-merging man/udev_monitor_filter_update.xml CONFLICT (add/add): Merge conflict in man/udev_monitor_filter_update.xml Auto-merging man/udev_list_entry.xml CONFLICT (add/add): Merge conflict in man/udev_list_entry.xml Auto-merging man/udev_enumerate_scan_devices.xml CONFLICT (add/add): Merge conflict in man/udev_enumerate_scan_devices.xml Auto-merging man/udev_enumerate_new.xml CONFLICT (add/add): Merge conflict in man/udev_enumerate_new.xml Auto-merging man/udev_enumerate_add_match_subsystem.xml CONFLICT (add/add): Merge conflict in man/udev_enumerate_add_match_subsystem.xml Auto-merging man/udev_device_new_from_syspath.xml CONFLICT (add/add): Merge conflict in man/udev_device_new_from_syspath.xml Auto-merging man/udev_device_has_tag.xml CONFLICT (add/add): Merge conflict in man/udev_device_has_tag.xml Auto-merging man/udev_device_get_syspath.xml CONFLICT (add/add): Merge conflict in man/udev_device_get_syspath.xml Auto-merging man/udev.xml CONFLICT (add/add): Merge conflict in man/udev.xml Auto-merging man/udev.conf.xml CONFLICT (add/add): Merge conflict in man/udev.conf.xml Auto-merging man/tmpfiles.d.xml CONFLICT (add/add): Merge conflict in man/tmpfiles.d.xml Auto-merging man/timesyncd.conf.xml CONFLICT (add/add): Merge conflict in man/timesyncd.conf.xml Auto-merging man/timedatectl.xml CONFLICT (add/add): Merge conflict in man/timedatectl.xml Auto-merging man/threads-aware.xml CONFLICT (add/add): Merge conflict in man/threads-aware.xml Auto-merging man/telinit.xml CONFLICT (add/add): Merge conflict in man/telinit.xml Auto-merging man/tc.xml CONFLICT (add/add): Merge conflict in man/tc.xml Auto-merging man/sysusers.d.xml CONFLICT (add/add): Merge conflict in man/sysusers.d.xml Auto-merging man/systemd.xml CONFLICT (add/add): Merge conflict in man/systemd.xml Auto-merging man/systemd.unit.xml CONFLICT (add/add): Merge conflict in man/systemd.unit.xml Auto-merging man/systemd.timer.xml CONFLICT (add/add): Merge conflict in man/systemd.timer.xml Auto-merging man/systemd.time.xml CONFLICT (add/add): Merge conflict in man/systemd.time.xml Auto-merging man/systemd.target.xml CONFLICT (add/add): Merge conflict in man/systemd.target.xml Auto-merging man/systemd.syntax.xml CONFLICT (add/add): Merge conflict in man/systemd.syntax.xml Auto-merging man/systemd.swap.xml CONFLICT (add/add): Merge conflict in man/systemd.swap.xml Auto-merging man/systemd.special.xml CONFLICT (add/add): Merge conflict in man/systemd.special.xml Auto-merging man/systemd.socket.xml CONFLICT (add/add): Merge conflict in man/systemd.socket.xml Auto-merging man/systemd.slice.xml CONFLICT (add/add): Merge conflict in man/systemd.slice.xml Auto-merging man/systemd.service.xml CONFLICT (add/add): Merge conflict in man/systemd.service.xml Auto-merging man/systemd.scope.xml CONFLICT (add/add): Merge conflict in man/systemd.scope.xml Auto-merging man/systemd.resource-control.xml CONFLICT (add/add): Merge conflict in man/systemd.resource-control.xml Auto-merging man/systemd.preset.xml CONFLICT (add/add): Merge conflict in man/systemd.preset.xml Auto-merging man/systemd.path.xml CONFLICT (add/add): Merge conflict in man/systemd.path.xml Auto-merging man/systemd.offline-updates.xml CONFLICT (add/add): Merge conflict in man/systemd.offline-updates.xml Auto-merging man/systemd.nspawn.xml CONFLICT (add/add): Merge conflict in man/systemd.nspawn.xml Auto-merging man/systemd.network.xml CONFLICT (add/add): Merge conflict in man/systemd.network.xml Auto-merging man/systemd.netdev.xml CONFLICT (add/add): Merge conflict in man/systemd.netdev.xml Auto-merging man/systemd.net-naming-scheme.xml CONFLICT (add/add): Merge conflict in man/systemd.net-naming-scheme.xml Auto-merging man/systemd.mount.xml CONFLICT (add/add): Merge conflict in man/systemd.mount.xml Auto-merging man/systemd.link.xml CONFLICT (add/add): Merge conflict in man/systemd.link.xml Auto-merging man/systemd.kill.xml CONFLICT (add/add): Merge conflict in man/systemd.kill.xml Auto-merging man/systemd.journal-fields.xml CONFLICT (add/add): Merge conflict in man/systemd.journal-fields.xml Auto-merging man/systemd.generator.xml CONFLICT (add/add): Merge conflict in man/systemd.generator.xml Auto-merging man/systemd.exec.xml CONFLICT (add/add): Merge conflict in man/systemd.exec.xml Auto-merging man/systemd.environment-generator.xml CONFLICT (add/add): Merge conflict in man/systemd.environment-generator.xml Auto-merging man/systemd.dnssd.xml CONFLICT (add/add): Merge conflict in man/systemd.dnssd.xml Auto-merging man/systemd.device.xml CONFLICT (add/add): Merge conflict in man/systemd.device.xml Auto-merging man/systemd.automount.xml CONFLICT (add/add): Merge conflict in man/systemd.automount.xml Auto-merging man/systemd-xdg-autostart-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-xdg-autostart-generator.xml Auto-merging man/systemd-volatile-root.service.xml CONFLICT (add/add): Merge conflict in man/systemd-volatile-root.service.xml Auto-merging man/systemd-veritysetup@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-veritysetup@.service.xml Auto-merging man/systemd-veritysetup-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-veritysetup-generator.xml Auto-merging man/systemd-vconsole-setup.service.xml CONFLICT (add/add): Merge conflict in man/systemd-vconsole-setup.service.xml Auto-merging man/systemd-userdbd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-userdbd.service.xml Auto-merging man/systemd-user-sessions.service.xml CONFLICT (add/add): Merge conflict in man/systemd-user-sessions.service.xml Auto-merging man/systemd-update-utmp.service.xml CONFLICT (add/add): Merge conflict in man/systemd-update-utmp.service.xml Auto-merging man/systemd-update-done.service.xml CONFLICT (add/add): Merge conflict in man/systemd-update-done.service.xml Auto-merging man/systemd-udevd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-udevd.service.xml Auto-merging man/systemd-udev-settle.service.xml CONFLICT (add/add): Merge conflict in man/systemd-udev-settle.service.xml Auto-merging man/systemd-tty-ask-password-agent.xml CONFLICT (add/add): Merge conflict in man/systemd-tty-ask-password-agent.xml Auto-merging man/systemd-tmpfiles.xml CONFLICT (add/add): Merge conflict in man/systemd-tmpfiles.xml Auto-merging man/systemd-timesyncd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-timesyncd.service.xml Auto-merging man/systemd-timedated.service.xml CONFLICT (add/add): Merge conflict in man/systemd-timedated.service.xml Auto-merging man/systemd-time-wait-sync.service.xml CONFLICT (add/add): Merge conflict in man/systemd-time-wait-sync.service.xml Auto-merging man/systemd-sysv-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-sysv-generator.xml Auto-merging man/systemd-sysusers.xml CONFLICT (add/add): Merge conflict in man/systemd-sysusers.xml Auto-merging man/systemd-system.conf.xml CONFLICT (add/add): Merge conflict in man/systemd-system.conf.xml Auto-merging man/systemd-system-update-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-system-update-generator.xml Auto-merging man/systemd-sysctl.service.xml CONFLICT (add/add): Merge conflict in man/systemd-sysctl.service.xml Auto-merging man/systemd-suspend.service.xml CONFLICT (add/add): Merge conflict in man/systemd-suspend.service.xml Auto-merging man/systemd-socket-proxyd.xml CONFLICT (add/add): Merge conflict in man/systemd-socket-proxyd.xml Auto-merging man/systemd-socket-activate.xml CONFLICT (add/add): Merge conflict in man/systemd-socket-activate.xml Auto-merging man/systemd-sleep.conf.xml CONFLICT (add/add): Merge conflict in man/systemd-sleep.conf.xml Auto-merging man/systemd-run.xml CONFLICT (add/add): Merge conflict in man/systemd-run.xml Auto-merging man/systemd-run-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-run-generator.xml Auto-merging man/systemd-rfkill.service.xml CONFLICT (add/add): Merge conflict in man/systemd-rfkill.service.xml Auto-merging man/systemd-resolved.service.xml CONFLICT (add/add): Merge conflict in man/systemd-resolved.service.xml Auto-merging man/systemd-repart.xml CONFLICT (add/add): Merge conflict in man/systemd-repart.xml Auto-merging man/systemd-remount-fs.service.xml CONFLICT (add/add): Merge conflict in man/systemd-remount-fs.service.xml Auto-merging man/systemd-rc-local-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-rc-local-generator.xml Auto-merging man/systemd-random-seed.service.xml CONFLICT (add/add): Merge conflict in man/systemd-random-seed.service.xml Auto-merging man/systemd-quotacheck.service.xml CONFLICT (add/add): Merge conflict in man/systemd-quotacheck.service.xml Auto-merging man/systemd-pstore.service.xml CONFLICT (add/add): Merge conflict in man/systemd-pstore.service.xml Auto-merging man/systemd-portabled.service.xml CONFLICT (add/add): Merge conflict in man/systemd-portabled.service.xml Auto-merging man/systemd-path.xml CONFLICT (add/add): Merge conflict in man/systemd-path.xml Auto-merging man/systemd-nspawn.xml CONFLICT (add/add): Merge conflict in man/systemd-nspawn.xml Auto-merging man/systemd-notify.xml CONFLICT (add/add): Merge conflict in man/systemd-notify.xml Auto-merging man/systemd-networkd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-networkd.service.xml Auto-merging man/systemd-networkd-wait-online.service.xml CONFLICT (add/add): Merge conflict in man/systemd-networkd-wait-online.service.xml Auto-merging man/systemd-network-generator.service.xml CONFLICT (add/add): Merge conflict in man/systemd-network-generator.service.xml Auto-merging man/systemd-mount.xml CONFLICT (add/add): Merge conflict in man/systemd-mount.xml Auto-merging man/systemd-modules-load.service.xml CONFLICT (add/add): Merge conflict in man/systemd-modules-load.service.xml Auto-merging man/systemd-makefs@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-makefs@.service.xml Auto-merging man/systemd-machined.service.xml CONFLICT (add/add): Merge conflict in man/systemd-machined.service.xml Auto-merging man/systemd-machine-id-setup.xml CONFLICT (add/add): Merge conflict in man/systemd-machine-id-setup.xml Auto-merging man/systemd-machine-id-commit.service.xml CONFLICT (add/add): Merge conflict in man/systemd-machine-id-commit.service.xml Auto-merging man/systemd-logind.service.xml CONFLICT (add/add): Merge conflict in man/systemd-logind.service.xml Auto-merging man/systemd-localed.service.xml CONFLICT (add/add): Merge conflict in man/systemd-localed.service.xml Auto-merging man/systemd-journald.service.xml CONFLICT (add/add): Merge conflict in man/systemd-journald.service.xml Auto-merging man/systemd-journal-upload.service.xml CONFLICT (add/add): Merge conflict in man/systemd-journal-upload.service.xml Auto-merging man/systemd-journal-remote.service.xml CONFLICT (add/add): Merge conflict in man/systemd-journal-remote.service.xml Auto-merging man/systemd-journal-gatewayd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-journal-gatewayd.service.xml Auto-merging man/systemd-initctl.service.xml CONFLICT (add/add): Merge conflict in man/systemd-initctl.service.xml Auto-merging man/systemd-inhibit.xml CONFLICT (add/add): Merge conflict in man/systemd-inhibit.xml Auto-merging man/systemd-importd.service.xml CONFLICT (add/add): Merge conflict in man/systemd-importd.service.xml Auto-merging man/systemd-id128.xml CONFLICT (add/add): Merge conflict in man/systemd-id128.xml Auto-merging man/systemd-hwdb.xml CONFLICT (add/add): Merge conflict in man/systemd-hwdb.xml Auto-merging man/systemd-hostnamed.service.xml CONFLICT (add/add): Merge conflict in man/systemd-hostnamed.service.xml Auto-merging man/systemd-homed.service.xml CONFLICT (add/add): Merge conflict in man/systemd-homed.service.xml Auto-merging man/systemd-hibernate-resume@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-hibernate-resume@.service.xml Auto-merging man/systemd-hibernate-resume-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-hibernate-resume-generator.xml Auto-merging man/systemd-halt.service.xml CONFLICT (add/add): Merge conflict in man/systemd-halt.service.xml Auto-merging man/systemd-gpt-auto-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-gpt-auto-generator.xml Auto-merging man/systemd-getty-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-getty-generator.xml Auto-merging man/systemd-fstab-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-fstab-generator.xml Auto-merging man/systemd-fsck@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-fsck@.service.xml Auto-merging man/systemd-firstboot.xml CONFLICT (add/add): Merge conflict in man/systemd-firstboot.xml Auto-merging man/systemd-escape.xml CONFLICT (add/add): Merge conflict in man/systemd-escape.xml Auto-merging man/systemd-environment-d-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-environment-d-generator.xml Auto-merging man/systemd-detect-virt.xml CONFLICT (add/add): Merge conflict in man/systemd-detect-virt.xml Auto-merging man/systemd-delta.xml CONFLICT (add/add): Merge conflict in man/systemd-delta.xml Auto-merging man/systemd-debug-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-debug-generator.xml Auto-merging man/systemd-cryptsetup@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-cryptsetup@.service.xml Auto-merging man/systemd-cryptsetup-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-cryptsetup-generator.xml Auto-merging man/systemd-coredump.xml CONFLICT (add/add): Merge conflict in man/systemd-coredump.xml Auto-merging man/systemd-cgtop.xml CONFLICT (add/add): Merge conflict in man/systemd-cgtop.xml Auto-merging man/systemd-cgls.xml CONFLICT (add/add): Merge conflict in man/systemd-cgls.xml Auto-merging man/systemd-cat.xml CONFLICT (add/add): Merge conflict in man/systemd-cat.xml Auto-merging man/systemd-boot.xml CONFLICT (add/add): Merge conflict in man/systemd-boot.xml Auto-merging man/systemd-boot-system-token.service.xml CONFLICT (add/add): Merge conflict in man/systemd-boot-system-token.service.xml Auto-merging man/systemd-boot-check-no-failures.service.xml CONFLICT (add/add): Merge conflict in man/systemd-boot-check-no-failures.service.xml Auto-merging man/systemd-bless-boot.service.xml CONFLICT (add/add): Merge conflict in man/systemd-bless-boot.service.xml Auto-merging man/systemd-bless-boot-generator.xml CONFLICT (add/add): Merge conflict in man/systemd-bless-boot-generator.xml Auto-merging man/systemd-binfmt.service.xml CONFLICT (add/add): Merge conflict in man/systemd-binfmt.service.xml Auto-merging man/systemd-backlight@.service.xml CONFLICT (add/add): Merge conflict in man/systemd-backlight@.service.xml Auto-merging man/systemd-ask-password.xml CONFLICT (add/add): Merge conflict in man/systemd-ask-password.xml Auto-merging man/systemd-ask-password-console.service.xml CONFLICT (add/add): Merge conflict in man/systemd-ask-password-console.service.xml Auto-merging man/systemd-analyze.xml CONFLICT (add/add): Merge conflict in man/systemd-analyze.xml Auto-merging man/systemctl.xml CONFLICT (add/add): Merge conflict in man/systemctl.xml Auto-merging man/system-only.xml CONFLICT (add/add): Merge conflict in man/system-only.xml Auto-merging man/sysctl.d.xml CONFLICT (add/add): Merge conflict in man/sysctl.d.xml Auto-merging man/supported-controllers.xml CONFLICT (add/add): Merge conflict in man/supported-controllers.xml Auto-merging man/standard-specifiers.xml CONFLICT (add/add): Merge conflict in man/standard-specifiers.xml Auto-merging man/standard-options.xml CONFLICT (add/add): Merge conflict in man/standard-options.xml Auto-merging man/standard-conf.xml CONFLICT (add/add): Merge conflict in man/standard-conf.xml Auto-merging man/shutdown.xml CONFLICT (add/add): Merge conflict in man/shutdown.xml Auto-merging man/sd_watchdog_enabled.xml CONFLICT (add/add): Merge conflict in man/sd_watchdog_enabled.xml Auto-merging man/sd_uid_get_state.xml CONFLICT (add/add): Merge conflict in man/sd_uid_get_state.xml Auto-merging man/sd_session_is_active.xml CONFLICT (add/add): Merge conflict in man/sd_session_is_active.xml Auto-merging man/sd_seat_get_active.xml CONFLICT (add/add): Merge conflict in man/sd_seat_get_active.xml Auto-merging man/sd_pid_get_owner_uid.xml CONFLICT (add/add): Merge conflict in man/sd_pid_get_owner_uid.xml Auto-merging man/sd_path_lookup.xml CONFLICT (add/add): Merge conflict in man/sd_path_lookup.xml Auto-merging man/sd_notify.xml CONFLICT (add/add): Merge conflict in man/sd_notify.xml Auto-merging man/sd_machine_get_class.xml CONFLICT (add/add): Merge conflict in man/sd_machine_get_class.xml Auto-merging man/sd_login_monitor_new.xml CONFLICT (add/add): Merge conflict in man/sd_login_monitor_new.xml Auto-merging man/sd_listen_fds.xml CONFLICT (add/add): Merge conflict in man/sd_listen_fds.xml Auto-merging man/sd_journal_stream_fd.xml CONFLICT (add/add): Merge conflict in man/sd_journal_stream_fd.xml Auto-merging man/sd_journal_seek_head.xml CONFLICT (add/add): Merge conflict in man/sd_journal_seek_head.xml Auto-merging man/sd_journal_query_unique.xml CONFLICT (add/add): Merge conflict in man/sd_journal_query_unique.xml Auto-merging man/sd_journal_print.xml CONFLICT (add/add): Merge conflict in man/sd_journal_print.xml Auto-merging man/sd_journal_open.xml CONFLICT (add/add): Merge conflict in man/sd_journal_open.xml Auto-merging man/sd_journal_next.xml CONFLICT (add/add): Merge conflict in man/sd_journal_next.xml Auto-merging man/sd_journal_has_runtime_files.xml CONFLICT (add/add): Merge conflict in man/sd_journal_has_runtime_files.xml Auto-merging man/sd_journal_get_usage.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_usage.xml Auto-merging man/sd_journal_get_realtime_usec.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_realtime_usec.xml Auto-merging man/sd_journal_get_fd.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_fd.xml Auto-merging man/sd_journal_get_data.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_data.xml Auto-merging man/sd_journal_get_cutoff_realtime_usec.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_cutoff_realtime_usec.xml Auto-merging man/sd_journal_get_cursor.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_cursor.xml Auto-merging man/sd_journal_get_catalog.xml CONFLICT (add/add): Merge conflict in man/sd_journal_get_catalog.xml Auto-merging man/sd_journal_enumerate_fields.xml CONFLICT (add/add): Merge conflict in man/sd_journal_enumerate_fields.xml Auto-merging man/sd_journal_add_match.xml CONFLICT (add/add): Merge conflict in man/sd_journal_add_match.xml Auto-merging man/sd_is_fifo.xml CONFLICT (add/add): Merge conflict in man/sd_is_fifo.xml Auto-merging man/sd_id128_to_string.xml CONFLICT (add/add): Merge conflict in man/sd_id128_to_string.xml Auto-merging man/sd_id128_randomize.xml CONFLICT (add/add): Merge conflict in man/sd_id128_randomize.xml Auto-merging man/sd_id128_get_machine.xml CONFLICT (add/add): Merge conflict in man/sd_id128_get_machine.xml Auto-merging man/sd_hwdb_new.xml CONFLICT (add/add): Merge conflict in man/sd_hwdb_new.xml Auto-merging man/sd_hwdb_get.xml CONFLICT (add/add): Merge conflict in man/sd_hwdb_get.xml Auto-merging man/sd_get_seats.xml CONFLICT (add/add): Merge conflict in man/sd_get_seats.xml Auto-merging man/sd_event_wait.xml CONFLICT (add/add): Merge conflict in man/sd_event_wait.xml Auto-merging man/sd_event_source_unref.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_unref.xml Auto-merging man/sd_event_source_set_userdata.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_userdata.xml Auto-merging man/sd_event_source_set_priority.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_priority.xml Auto-merging man/sd_event_source_set_prepare.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_prepare.xml Auto-merging man/sd_event_source_set_floating.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_floating.xml Auto-merging man/sd_event_source_set_enabled.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_enabled.xml Auto-merging man/sd_event_source_set_destroy_callback.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_destroy_callback.xml Auto-merging man/sd_event_source_set_description.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_set_description.xml Auto-merging man/sd_event_source_get_pending.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_get_pending.xml Auto-merging man/sd_event_source_get_event.xml CONFLICT (add/add): Merge conflict in man/sd_event_source_get_event.xml Auto-merging man/sd_event_set_watchdog.xml CONFLICT (add/add): Merge conflict in man/sd_event_set_watchdog.xml Auto-merging man/sd_event_run.xml CONFLICT (add/add): Merge conflict in man/sd_event_run.xml Auto-merging man/sd_event_now.xml CONFLICT (add/add): Merge conflict in man/sd_event_now.xml Auto-merging man/sd_event_new.xml CONFLICT (add/add): Merge conflict in man/sd_event_new.xml Auto-merging man/sd_event_get_fd.xml CONFLICT (add/add): Merge conflict in man/sd_event_get_fd.xml Auto-merging man/sd_event_exit.xml CONFLICT (add/add): Merge conflict in man/sd_event_exit.xml Auto-merging man/sd_event_add_time.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_time.xml Auto-merging man/sd_event_add_signal.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_signal.xml Auto-merging man/sd_event_add_io.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_io.xml Auto-merging man/sd_event_add_inotify.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_inotify.xml Auto-merging man/sd_event_add_defer.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_defer.xml Auto-merging man/sd_event_add_child.xml CONFLICT (add/add): Merge conflict in man/sd_event_add_child.xml Auto-merging man/sd_bus_wait.xml CONFLICT (add/add): Merge conflict in man/sd_bus_wait.xml Auto-merging man/sd_bus_track_new.xml CONFLICT (add/add): Merge conflict in man/sd_bus_track_new.xml Auto-merging man/sd_bus_track_add_name.xml CONFLICT (add/add): Merge conflict in man/sd_bus_track_add_name.xml Auto-merging man/sd_bus_start.xml CONFLICT (add/add): Merge conflict in man/sd_bus_start.xml Auto-merging man/sd_bus_slot_set_userdata.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_set_userdata.xml Auto-merging man/sd_bus_slot_set_floating.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_set_floating.xml Auto-merging man/sd_bus_slot_set_destroy_callback.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_set_destroy_callback.xml Auto-merging man/sd_bus_slot_set_description.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_set_description.xml Auto-merging man/sd_bus_slot_ref.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_ref.xml Auto-merging man/sd_bus_slot_get_bus.xml CONFLICT (add/add): Merge conflict in man/sd_bus_slot_get_bus.xml Auto-merging man/sd_bus_set_watch_bind.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_watch_bind.xml Auto-merging man/sd_bus_set_server.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_server.xml Auto-merging man/sd_bus_set_sender.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_sender.xml Auto-merging man/sd_bus_set_property.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_property.xml Auto-merging man/sd_bus_set_method_call_timeout.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_method_call_timeout.xml Auto-merging man/sd_bus_set_exit_on_disconnect.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_exit_on_disconnect.xml Auto-merging man/sd_bus_set_description.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_description.xml Auto-merging man/sd_bus_set_connected_signal.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_connected_signal.xml Auto-merging man/sd_bus_set_close_on_exit.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_close_on_exit.xml Auto-merging man/sd_bus_set_address.xml CONFLICT (add/add): Merge conflict in man/sd_bus_set_address.xml Auto-merging man/sd_bus_send.xml CONFLICT (add/add): Merge conflict in man/sd_bus_send.xml Auto-merging man/sd_bus_request_name.xml CONFLICT (add/add): Merge conflict in man/sd_bus_request_name.xml Auto-merging man/sd_bus_reply_method_return.xml CONFLICT (add/add): Merge conflict in man/sd_bus_reply_method_return.xml Auto-merging man/sd_bus_reply_method_error.xml CONFLICT (add/add): Merge conflict in man/sd_bus_reply_method_error.xml Auto-merging man/sd_bus_query_sender_creds.xml CONFLICT (add/add): Merge conflict in man/sd_bus_query_sender_creds.xml Auto-merging man/sd_bus_process.xml CONFLICT (add/add): Merge conflict in man/sd_bus_process.xml Auto-merging man/sd_bus_path_encode.xml CONFLICT (add/add): Merge conflict in man/sd_bus_path_encode.xml Auto-merging man/sd_bus_new.xml CONFLICT (add/add): Merge conflict in man/sd_bus_new.xml Auto-merging man/sd_bus_negotiate_fds.xml CONFLICT (add/add): Merge conflict in man/sd_bus_negotiate_fds.xml Auto-merging man/sd_bus_message_verify_type.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_verify_type.xml Auto-merging man/sd_bus_message_skip.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_skip.xml Auto-merging man/sd_bus_message_set_expect_reply.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_set_expect_reply.xml Auto-merging man/sd_bus_message_set_destination.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_set_destination.xml Auto-merging man/sd_bus_message_sensitive.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_sensitive.xml Auto-merging man/sd_bus_message_seal.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_seal.xml Auto-merging man/sd_bus_message_rewind.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_rewind.xml Auto-merging man/sd_bus_message_read_strv.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_read_strv.xml Auto-merging man/sd_bus_message_read_basic.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_read_basic.xml Auto-merging man/sd_bus_message_read_array.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_read_array.xml Auto-merging man/sd_bus_message_read.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_read.xml Auto-merging man/sd_bus_message_open_container.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_open_container.xml Auto-merging man/sd_bus_message_new_signal.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_new_signal.xml Auto-merging man/sd_bus_message_new_method_error.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_new_method_error.xml Auto-merging man/sd_bus_message_new_method_call.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_new_method_call.xml Auto-merging man/sd_bus_message_new.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_new.xml Auto-merging man/sd_bus_message_get_type.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_get_type.xml Auto-merging man/sd_bus_message_get_signature.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_get_signature.xml Auto-merging man/sd_bus_message_get_monotonic_usec.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_get_monotonic_usec.xml Auto-merging man/sd_bus_message_get_cookie.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_get_cookie.xml Auto-merging man/sd_bus_message_dump.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_dump.xml Auto-merging man/sd_bus_message_copy.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_copy.xml Auto-merging man/sd_bus_message_at_end.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_at_end.xml Auto-merging man/sd_bus_message_append_strv.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append_strv.xml Auto-merging man/sd_bus_message_append_string_memfd.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append_string_memfd.xml Auto-merging man/sd_bus_message_append_basic.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append_basic.xml Auto-merging man/sd_bus_message_append_array.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append_array.xml Auto-merging man/sd_bus_message_append.xml CONFLICT (add/add): Merge conflict in man/sd_bus_message_append.xml Auto-merging man/sd_bus_list_names.xml CONFLICT (add/add): Merge conflict in man/sd_bus_list_names.xml Auto-merging man/sd_bus_is_open.xml CONFLICT (add/add): Merge conflict in man/sd_bus_is_open.xml Auto-merging man/sd_bus_interface_name_is_valid.xml CONFLICT (add/add): Merge conflict in man/sd_bus_interface_name_is_valid.xml Auto-merging man/sd_bus_get_name_machine_id.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_name_machine_id.xml Auto-merging man/sd_bus_get_name_creds.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_name_creds.xml Auto-merging man/sd_bus_get_n_queued_read.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_n_queued_read.xml Auto-merging man/sd_bus_get_fd.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_fd.xml Auto-merging man/sd_bus_get_current_handler.xml CONFLICT (add/add): Merge conflict in man/sd_bus_get_current_handler.xml Auto-merging man/sd_bus_error_add_map.xml CONFLICT (add/add): Merge conflict in man/sd_bus_error_add_map.xml Auto-merging man/sd_bus_error.xml CONFLICT (add/add): Merge conflict in man/sd_bus_error.xml Auto-merging man/sd_bus_enqueue_for_read.xml CONFLICT (add/add): Merge conflict in man/sd_bus_enqueue_for_read.xml Auto-merging man/sd_bus_emit_signal.xml CONFLICT (add/add): Merge conflict in man/sd_bus_emit_signal.xml Auto-merging man/sd_bus_default.xml CONFLICT (add/add): Merge conflict in man/sd_bus_default.xml Auto-merging man/sd_bus_creds_new_from_pid.xml CONFLICT (add/add): Merge conflict in man/sd_bus_creds_new_from_pid.xml Auto-merging man/sd_bus_creds_get_pid.xml CONFLICT (add/add): Merge conflict in man/sd_bus_creds_get_pid.xml Auto-merging man/sd_bus_close.xml CONFLICT (add/add): Merge conflict in man/sd_bus_close.xml Auto-merging man/sd_bus_can_send.xml CONFLICT (add/add): Merge conflict in man/sd_bus_can_send.xml Auto-merging man/sd_bus_call_method.xml CONFLICT (add/add): Merge conflict in man/sd_bus_call_method.xml Auto-merging man/sd_bus_call.xml CONFLICT (add/add): Merge conflict in man/sd_bus_call.xml Auto-merging man/sd_bus_attach_event.xml CONFLICT (add/add): Merge conflict in man/sd_bus_attach_event.xml Auto-merging man/sd_bus_add_object_manager.xml CONFLICT (add/add): Merge conflict in man/sd_bus_add_object_manager.xml Auto-merging man/sd_bus_add_object.xml CONFLICT (add/add): Merge conflict in man/sd_bus_add_object.xml Auto-merging man/sd_bus_add_node_enumerator.xml CONFLICT (add/add): Merge conflict in man/sd_bus_add_node_enumerator.xml Auto-merging man/sd_bus_add_match.xml CONFLICT (add/add): Merge conflict in man/sd_bus_add_match.xml Auto-merging man/sd_booted.xml CONFLICT (add/add): Merge conflict in man/sd_booted.xml Auto-merging man/sd-login.xml CONFLICT (add/add): Merge conflict in man/sd-login.xml Auto-merging man/sd-journal.xml CONFLICT (add/add): Merge conflict in man/sd-journal.xml Auto-merging man/sd-id128.xml CONFLICT (add/add): Merge conflict in man/sd-id128.xml Auto-merging man/sd-hwdb.xml CONFLICT (add/add): Merge conflict in man/sd-hwdb.xml Auto-merging man/sd-event.xml CONFLICT (add/add): Merge conflict in man/sd-event.xml Auto-merging man/sd-daemon.xml CONFLICT (add/add): Merge conflict in man/sd-daemon.xml Auto-merging man/sd-bus.xml CONFLICT (add/add): Merge conflict in man/sd-bus.xml Auto-merging man/sd-bus-errors.xml CONFLICT (add/add): Merge conflict in man/sd-bus-errors.xml Auto-merging man/runlevel.xml CONFLICT (add/add): Merge conflict in man/runlevel.xml Auto-merging man/rules/meson.build CONFLICT (add/add): Merge conflict in man/rules/meson.build Auto-merging man/resolved.conf.xml CONFLICT (add/add): Merge conflict in man/resolved.conf.xml Auto-merging man/resolvectl.xml CONFLICT (add/add): Merge conflict in man/resolvectl.xml Auto-merging man/repart.d.xml CONFLICT (add/add): Merge conflict in man/repart.d.xml Auto-merging man/pstore.conf.xml CONFLICT (add/add): Merge conflict in man/pstore.conf.xml Auto-merging man/portablectl.xml CONFLICT (add/add): Merge conflict in man/portablectl.xml Auto-merging man/pam_systemd_home.xml CONFLICT (add/add): Merge conflict in man/pam_systemd_home.xml Auto-merging man/pam_systemd.xml CONFLICT (add/add): Merge conflict in man/pam_systemd.xml Auto-merging man/os-release.xml CONFLICT (add/add): Merge conflict in man/os-release.xml Auto-merging man/org.freedesktop.timedate1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.timedate1.xml Auto-merging man/org.freedesktop.systemd1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.systemd1.xml Auto-merging man/org.freedesktop.resolve1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.resolve1.xml Auto-merging man/org.freedesktop.machine1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.machine1.xml Auto-merging man/org.freedesktop.login1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.login1.xml Auto-merging man/org.freedesktop.locale1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.locale1.xml Auto-merging man/org.freedesktop.import1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.import1.xml Auto-merging man/org.freedesktop.hostname1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.hostname1.xml Auto-merging man/org.freedesktop.home1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.home1.xml Auto-merging man/org.freedesktop.LogControl1.xml CONFLICT (add/add): Merge conflict in man/org.freedesktop.LogControl1.xml Auto-merging man/nss-systemd.xml CONFLICT (add/add): Merge conflict in man/nss-systemd.xml Auto-merging man/nss-resolve.xml CONFLICT (add/add): Merge conflict in man/nss-resolve.xml Auto-merging man/nss-mymachines.xml CONFLICT (add/add): Merge conflict in man/nss-mymachines.xml Auto-merging man/nss-myhostname.xml CONFLICT (add/add): Merge conflict in man/nss-myhostname.xml Auto-merging man/networkd.conf.xml CONFLICT (add/add): Merge conflict in man/networkd.conf.xml Auto-merging man/networkctl.xml CONFLICT (add/add): Merge conflict in man/networkctl.xml Auto-merging man/modules-load.d.xml CONFLICT (add/add): Merge conflict in man/modules-load.d.xml Auto-merging man/meson.build CONFLICT (add/add): Merge conflict in man/meson.build Auto-merging man/man.in CONFLICT (add/add): Merge conflict in man/man.in Auto-merging man/machinectl.xml CONFLICT (add/add): Merge conflict in man/machinectl.xml Auto-merging man/machine-info.xml CONFLICT (add/add): Merge conflict in man/machine-info.xml Auto-merging man/machine-id.xml CONFLICT (add/add): Merge conflict in man/machine-id.xml Auto-merging man/logind.conf.xml CONFLICT (add/add): Merge conflict in man/logind.conf.xml Auto-merging man/loginctl.xml CONFLICT (add/add): Merge conflict in man/loginctl.xml Auto-merging man/localtime.xml CONFLICT (add/add): Merge conflict in man/localtime.xml Auto-merging man/localectl.xml CONFLICT (add/add): Merge conflict in man/localectl.xml Auto-merging man/locale.conf.xml CONFLICT (add/add): Merge conflict in man/locale.conf.xml Auto-merging man/loader.conf.xml CONFLICT (add/add): Merge conflict in man/loader.conf.xml Auto-merging man/libudev.xml CONFLICT (add/add): Merge conflict in man/libudev.xml Auto-merging man/libsystemd-pkgconfig.xml CONFLICT (add/add): Merge conflict in man/libsystemd-pkgconfig.xml Auto-merging man/less-variables.xml CONFLICT (add/add): Merge conflict in man/less-variables.xml Auto-merging man/kernel-install.xml CONFLICT (add/add): Merge conflict in man/kernel-install.xml Auto-merging man/kernel-command-line.xml CONFLICT (add/add): Merge conflict in man/kernel-command-line.xml Auto-merging man/journald.conf.xml CONFLICT (add/add): Merge conflict in man/journald.conf.xml Auto-merging man/journalctl.xml CONFLICT (add/add): Merge conflict in man/journalctl.xml Auto-merging man/journal-upload.conf.xml CONFLICT (add/add): Merge conflict in man/journal-upload.conf.xml Auto-merging man/journal-remote.conf.xml CONFLICT (add/add): Merge conflict in man/journal-remote.conf.xml Auto-merging man/hwdb.xml CONFLICT (add/add): Merge conflict in man/hwdb.xml Auto-merging man/html.in CONFLICT (add/add): Merge conflict in man/html.in Auto-merging man/hostnamectl.xml CONFLICT (add/add): Merge conflict in man/hostnamectl.xml Auto-merging man/hostname.xml CONFLICT (add/add): Merge conflict in man/hostname.xml Auto-merging man/homed.conf.xml CONFLICT (add/add): Merge conflict in man/homed.conf.xml Auto-merging man/homectl.xml CONFLICT (add/add): Merge conflict in man/homectl.xml Auto-merging man/halt.xml CONFLICT (add/add): Merge conflict in man/halt.xml Auto-merging man/file-hierarchy.xml CONFLICT (add/add): Merge conflict in man/file-hierarchy.xml Auto-merging man/environment.d.xml CONFLICT (add/add): Merge conflict in man/environment.d.xml Auto-merging man/dnssec-trust-anchors.d.xml CONFLICT (add/add): Merge conflict in man/dnssec-trust-anchors.d.xml Auto-merging man/directives-template.xml CONFLICT (add/add): Merge conflict in man/directives-template.xml Auto-merging man/daemon.xml CONFLICT (add/add): Merge conflict in man/daemon.xml Auto-merging man/custom-man.xsl CONFLICT (add/add): Merge conflict in man/custom-man.xsl Auto-merging man/custom-html.xsl CONFLICT (add/add): Merge conflict in man/custom-html.xsl Auto-merging man/custom-entities.ent.in CONFLICT (add/add): Merge conflict in man/custom-entities.ent.in Auto-merging man/crypttab.xml CONFLICT (add/add): Merge conflict in man/crypttab.xml Auto-merging man/coredumpctl.xml CONFLICT (add/add): Merge conflict in man/coredumpctl.xml Auto-merging man/coredump.conf.xml CONFLICT (add/add): Merge conflict in man/coredump.conf.xml Auto-merging man/busctl.xml CONFLICT (add/add): Merge conflict in man/busctl.xml Auto-merging man/bootup.xml CONFLICT (add/add): Merge conflict in man/bootup.xml Auto-merging man/bootctl.xml CONFLICT (add/add): Merge conflict in man/bootctl.xml Auto-merging man/binfmt.d.xml CONFLICT (add/add): Merge conflict in man/binfmt.d.xml Auto-merging hwdb.d/usb.ids CONFLICT (add/add): Merge conflict in hwdb.d/usb.ids Auto-merging hwdb.d/pnp_id_registry.html CONFLICT (add/add): Merge conflict in hwdb.d/pnp_id_registry.html Auto-merging hwdb.d/pci.ids CONFLICT (add/add): Merge conflict in hwdb.d/pci.ids Auto-merging hwdb.d/parse_hwdb.py CONFLICT (add/add): Merge conflict in hwdb.d/parse_hwdb.py Auto-merging hwdb.d/meson.build CONFLICT (add/add): Merge conflict in hwdb.d/meson.build Auto-merging hwdb.d/ma-small.txt CONFLICT (add/add): Merge conflict in hwdb.d/ma-small.txt Auto-merging hwdb.d/ma-medium.txt CONFLICT (add/add): Merge conflict in hwdb.d/ma-medium.txt Auto-merging hwdb.d/ma-large.txt CONFLICT (add/add): Merge conflict in hwdb.d/ma-large.txt Auto-merging hwdb.d/acpi_id_registry.html CONFLICT (add/add): Merge conflict in hwdb.d/acpi_id_registry.html Auto-merging hwdb.d/70-pointingstick.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/70-pointingstick.hwdb Auto-merging hwdb.d/70-mouse.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/70-mouse.hwdb Auto-merging hwdb.d/60-sensor.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/60-sensor.hwdb Auto-merging hwdb.d/60-keyboard.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/60-keyboard.hwdb Auto-merging hwdb.d/60-input-id.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/60-input-id.hwdb Auto-merging hwdb.d/60-evdev.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/60-evdev.hwdb Auto-merging hwdb.d/20-usb-vendor-model.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-usb-vendor-model.hwdb Auto-merging hwdb.d/20-pci-vendor-model.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-pci-vendor-model.hwdb Auto-merging hwdb.d/20-pci-classes.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-pci-classes.hwdb Auto-merging hwdb.d/20-acpi-vendor.hwdb.patch CONFLICT (add/add): Merge conflict in hwdb.d/20-acpi-vendor.hwdb.patch Auto-merging hwdb.d/20-acpi-vendor.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-acpi-vendor.hwdb Auto-merging hwdb.d/20-OUI.hwdb CONFLICT (add/add): Merge conflict in hwdb.d/20-OUI.hwdb Auto-merging factory/etc/nsswitch.conf CONFLICT (add/add): Merge conflict in factory/etc/nsswitch.conf Auto-merging docs/var-log/meson.build CONFLICT (add/add): Merge conflict in docs/var-log/meson.build Auto-merging docs/sysvinit/meson.build CONFLICT (add/add): Merge conflict in docs/sysvinit/meson.build Auto-merging docs/USER_RECORD.md CONFLICT (add/add): Merge conflict in docs/USER_RECORD.md Auto-merging docs/USER_NAMES.md CONFLICT (add/add): Merge conflict in docs/USER_NAMES.md Auto-merging docs/USER_GROUP_API.md CONFLICT (add/add): Merge conflict in docs/USER_GROUP_API.md Auto-merging docs/UIDS-GIDS.md CONFLICT (add/add): Merge conflict in docs/UIDS-GIDS.md Auto-merging docs/TRANSIENT-SETTINGS.md CONFLICT (add/add): Merge conflict in docs/TRANSIENT-SETTINGS.md Auto-merging docs/TEMPORARY_DIRECTORIES.md CONFLICT (add/add): Merge conflict in docs/TEMPORARY_DIRECTORIES.md Auto-merging docs/ROOT_STORAGE_DAEMONS.md CONFLICT (add/add): Merge conflict in docs/ROOT_STORAGE_DAEMONS.md Auto-merging docs/RELEASE.md CONFLICT (add/add): Merge conflict in docs/RELEASE.md Auto-merging docs/RANDOM_SEEDS.md CONFLICT (add/add): Merge conflict in docs/RANDOM_SEEDS.md Auto-merging docs/PORTABILITY_AND_STABILITY.md CONFLICT (add/add): Merge conflict in docs/PORTABILITY_AND_STABILITY.md Auto-merging docs/INITRD_INTERFACE.md CONFLICT (add/add): Merge conflict in docs/INITRD_INTERFACE.md Auto-merging docs/HOME_DIRECTORY.md CONFLICT (add/add): Merge conflict in docs/HOME_DIRECTORY.md Auto-merging docs/HACKING.md CONFLICT (add/add): Merge conflict in docs/HACKING.md Auto-merging docs/GROUP_RECORD.md CONFLICT (add/add): Merge conflict in docs/GROUP_RECORD.md Auto-merging docs/ENVIRONMENT.md CONFLICT (add/add): Merge conflict in docs/ENVIRONMENT.md Auto-merging docs/DISCOVERABLE_PARTITIONS.md CONFLICT (add/add): Merge conflict in docs/DISCOVERABLE_PARTITIONS.md Auto-merging docs/DESKTOP_ENVIRONMENTS.md CONFLICT (add/add): Merge conflict in docs/DESKTOP_ENVIRONMENTS.md Auto-merging docs/CONTRIBUTING.md CONFLICT (add/add): Merge conflict in docs/CONTRIBUTING.md Auto-merging docs/CONTAINER_INTERFACE.md CONFLICT (add/add): Merge conflict in docs/CONTAINER_INTERFACE.md Auto-merging docs/CODING_STYLE.md CONFLICT (add/add): Merge conflict in docs/CODING_STYLE.md Auto-merging docs/CGROUP_DELEGATION.md CONFLICT (add/add): Merge conflict in docs/CGROUP_DELEGATION.md Auto-merging docs/BOOT_LOADER_SPECIFICATION.md CONFLICT (add/add): Merge conflict in docs/BOOT_LOADER_SPECIFICATION.md Auto-merging docs/BOOT_LOADER_INTERFACE.md CONFLICT (add/add): Merge conflict in docs/BOOT_LOADER_INTERFACE.md Auto-merging docs/BLOCK_DEVICE_LOCKING.md CONFLICT (add/add): Merge conflict in docs/BLOCK_DEVICE_LOCKING.md Auto-merging docs/AUTOMATIC_BOOT_ASSESSMENT.md CONFLICT (add/add): Merge conflict in docs/AUTOMATIC_BOOT_ASSESSMENT.md Auto-merging coccinelle/xsprintf.cocci CONFLICT (add/add): Merge conflict in coccinelle/xsprintf.cocci Auto-merging coccinelle/synthetic-errno.cocci CONFLICT (add/add): Merge conflict in coccinelle/synthetic-errno.cocci Auto-merging coccinelle/strjoin.cocci CONFLICT (add/add): Merge conflict in coccinelle/strjoin.cocci Auto-merging coccinelle/run-coccinelle.sh CONFLICT (add/add): Merge conflict in coccinelle/run-coccinelle.sh Auto-merging coccinelle/not_in_set.cocci CONFLICT (add/add): Merge conflict in coccinelle/not_in_set.cocci Auto-merging coccinelle/in_set.cocci CONFLICT (add/add): Merge conflict in coccinelle/in_set.cocci Auto-merging coccinelle/flags-set.cocci CONFLICT (add/add): Merge conflict in coccinelle/flags-set.cocci Auto-merging coccinelle/errno.cocci CONFLICT (add/add): Merge conflict in coccinelle/errno.cocci Auto-merging coccinelle/equals-null.cocci CONFLICT (add/add): Merge conflict in coccinelle/equals-null.cocci Auto-merging coccinelle/empty-to-root.cocci CONFLICT (add/add): Merge conflict in coccinelle/empty-to-root.cocci Auto-merging catalog/systemd.zh_TW.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.zh_TW.catalog.in Auto-merging catalog/systemd.zh_CN.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.zh_CN.catalog.in Auto-merging catalog/systemd.sr.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.sr.catalog.in Auto-merging catalog/systemd.ru.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.ru.catalog.in Auto-merging catalog/systemd.pt_BR.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.pt_BR.catalog.in Auto-merging catalog/systemd.pl.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.pl.catalog.in Auto-merging catalog/systemd.ko.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.ko.catalog.in Auto-merging catalog/systemd.it.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.it.catalog.in Auto-merging catalog/systemd.hu.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.hu.catalog.in Auto-merging catalog/systemd.hr.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.hr.catalog.in Auto-merging catalog/systemd.fr.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.fr.catalog.in Auto-merging catalog/systemd.de.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.de.catalog.in Auto-merging catalog/systemd.da.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.da.catalog.in Auto-merging catalog/systemd.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.catalog.in Auto-merging catalog/systemd.bg.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.bg.catalog.in Auto-merging catalog/systemd.be@latin.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.be@latin.catalog.in Auto-merging catalog/systemd.be.catalog.in CONFLICT (add/add): Merge conflict in catalog/systemd.be.catalog.in Auto-merging catalog/meson.build CONFLICT (add/add): Merge conflict in catalog/meson.build Auto-merging TODO CONFLICT (add/add): Merge conflict in TODO Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging README CONFLICT (add/add): Merge conflict in README Auto-merging NEWS CONFLICT (add/add): Merge conflict in NEWS Auto-merging .travis.yml CONFLICT (add/add): Merge conflict in .travis.yml Auto-merging .mkosi/mkosi.ubuntu CONFLICT (add/add): Merge conflict in .mkosi/mkosi.ubuntu Auto-merging .mkosi/mkosi.opensuse CONFLICT (add/add): Merge conflict in .mkosi/mkosi.opensuse Auto-merging .mkosi/mkosi.fedora CONFLICT (add/add): Merge conflict in .mkosi/mkosi.fedora Auto-merging .mkosi/mkosi.debian CONFLICT (add/add): Merge conflict in .mkosi/mkosi.debian Auto-merging .mkosi/mkosi.arch CONFLICT (add/add): Merge conflict in .mkosi/mkosi.arch Auto-merging .mailmap CONFLICT (add/add): Merge conflict in .mailmap Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .github/ISSUE_TEMPLATE/Bug_report.md CONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/Bug_report.md Auto-merging .clang-format CONFLICT (add/add): Merge conflict in .clang-format Automatic merge failed; fix conflicts and then commit the result. RUN: /usr/share/launchpad-buildd/bin/in-target scan-for-processes --backend=chroot --series=groovy --arch=amd64 RECIPEBRANCHBUILD-2772633 Scanning for processes to kill in build RECIPEBRANCHBUILD-2772633