Merge pull request #8125 from poettering/cgroups-migrate

Trivial merge conflict resolved locally.
2018-02-15 16:15:45 +01:00
parent f45b801551 1e78432157
commit 648461c07d
26 changed files with 888 additions and 299 deletions
@@ -1368,4 +1368,8 @@ struct fib_rule_uid_range {
 #define FALLOC_FL_PUNCH_HOLE 0x02
 #endif

+#ifndef PF_KTHREAD
+#define PF_KTHREAD 0x00200000
+#endif
+
 #include "missing_syscall.h"