Merge pull request #8125 from poettering/cgroups-migrate

Trivial merge conflict resolved locally.

diff --cc src/basic/missing.h
index ed884dddad7a28185ca338c1f334828f5116492f,f3f2743c0313655e15dc1f3df9091a06f573533c..2f68e3ae8a5d1fe911b733da71c1aed94fa6d0be
--- 1/src/basic/missing.h
--- 2/src/basic/missing.h
+++ b/src/basic/missing.h
@@@ -1360,12 -1355,8 +1360,16 @@@ struct fib_rule_uid_range 
  #define NS_GET_NSTYPE _IO(0xb7, 0x3)
  #endif
  
 +#ifndef FALLOC_FL_KEEP_SIZE
 +#define FALLOC_FL_KEEP_SIZE 0x01
 +#endif
 +
 +#ifndef FALLOC_FL_PUNCH_HOLE
 +#define FALLOC_FL_PUNCH_HOLE 0x02
 +#endif
 +
+ #ifndef PF_KTHREAD
+ #define PF_KTHREAD 0x00200000
+ #endif
+ 
  #include "missing_syscall.h"

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

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

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

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