diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-29 16:06:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-29 16:06:48 +0800 |
| commit | c39fa164766e4ead0594e8b6fd382b57fd9d5a1f (patch) | |
| tree | 0bb4485a2b0ab7babf31e42a58e64d2f340153d8 /include/uapi | |
| parent | 3597171388a04229cd831e371b6e1079417d6d52 (diff) | |
| parent | 072c0f9ee4023f380774186c8cb95c0118d2f8dc (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'include/uapi')
| -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 cfb5c406f344..d588107c9dce 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -56,6 +56,7 @@ #define SMB_SUPER_MAGIC 0x517B #define CGROUP_SUPER_MAGIC 0x27e0eb +#define CGROUP2_SUPER_MAGIC 0x63677270 #define STACK_END_MAGIC 0x57AC6E9D |