diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-29 15:58:42 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-29 15:58:42 +0800 |
| commit | 072c0f9ee4023f380774186c8cb95c0118d2f8dc (patch) | |
| tree | a3cec9bc2776965d5e9c65997287e447dfcbe7c1 /include/uapi/linux | |
| parent | edf995d84e268ded42276ae0967a4b2c8541f08b (diff) | |
| parent | fe10f4e69509a4c384e550e3404b2606f4fd8b87 (diff) | |
Merge remote-tracking branch 'origin/v4.4/topic/wb-cg2' into linux-linaro-lsk-v4.4
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/magic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index accb036bbc9c..b283d56c1db9 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -54,6 +54,7 @@ #define SMB_SUPER_MAGIC 0x517B #define CGROUP_SUPER_MAGIC 0x27e0eb +#define CGROUP2_SUPER_MAGIC 0x63677270 #define STACK_END_MAGIC 0x57AC6E9D |