diff options
| author | Al Viro | 2014-12-11 03:31:59 +0100 |
|---|---|---|
| committer | Al Viro | 2014-12-11 03:31:59 +0100 |
| commit | 707c5960f102f8cdafb9406047b158abc71b391f (patch) | |
| tree | 31d195b1c48cefa2d04da7cc801824f87a0a9887 /include/uapi | |
| parent | Merge branch 'iov_iter' into for-next (diff) | |
| parent | kill proc_ns completely (diff) | |
| download | kernel-qcow2-linux-707c5960f102f8cdafb9406047b158abc71b391f.tar.gz kernel-qcow2-linux-707c5960f102f8cdafb9406047b158abc71b391f.tar.xz kernel-qcow2-linux-707c5960f102f8cdafb9406047b158abc71b391f.zip | |
Merge branch 'nsfs' into for-next
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 77c60311a6c6..7d664ea85ebd 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -72,5 +72,6 @@ #define MTD_INODE_FS_MAGIC 0x11307854 #define ANON_INODE_FS_MAGIC 0x09041934 #define BTRFS_TEST_MAGIC 0x73727279 +#define NSFS_MAGIC 0x6e736673 #endif /* __LINUX_MAGIC_H__ */ |