diff options
| author | Dan Williams | 2016-10-08 01:46:30 +0200 |
|---|---|---|
| committer | Dan Williams | 2016-10-08 01:46:30 +0200 |
| commit | e476f94482fc20a23b7b33b3d8e50f1953f71828 (patch) | |
| tree | 8ac0e5812ea683b348bb70ba8c0d513e2a8f5739 /include/uapi | |
| parent | Merge branch 'for-4.9/libnvdimm' into libnvdimm-for-next (diff) | |
| parent | /dev/dax: fix Kconfig dependency build breakage (diff) | |
| download | kernel-qcow2-linux-e476f94482fc20a23b7b33b3d8e50f1953f71828.tar.gz kernel-qcow2-linux-e476f94482fc20a23b7b33b3d8e50f1953f71828.tar.xz kernel-qcow2-linux-e476f94482fc20a23b7b33b3d8e50f1953f71828.zip | |
Merge branch 'for-4.9/dax' into libnvdimm-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 e398beac67b8..9bd559472c92 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -65,6 +65,7 @@ #define V9FS_MAGIC 0x01021997 #define BDEVFS_MAGIC 0x62646576 +#define DAXFS_MAGIC 0x64646178 #define BINFMTFS_MAGIC 0x42494e4d #define DEVPTS_SUPER_MAGIC 0x1cd1 #define FUTEXFS_SUPER_MAGIC 0xBAD1DEA |