From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 15 Feb 2018 15:15:45 +0000 (+0100)
Subject: Merge pull request #8125 from poettering/cgroups-migrate
X-Git-Tag: v238~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=648461c07dbe722b1298686a3b35d339a5fa5ab0;p=thirdparty%2Fsystemd.git

Merge pull request #8125 from poettering/cgroups-migrate

Trivial merge conflict resolved locally.
---

648461c07dbe722b1298686a3b35d339a5fa5ab0
diff --cc src/basic/missing.h
index ed884dddad7,f3f2743c031..2f68e3ae8a5
--- a/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"