Merge branch 'for-4.9/dax' into libnvdimm-for-next

2016-10-07 16:46:30 -07:00
parent 178d6f4be8 4e65e9381c
commit e476f94482
7 changed files with 365 additions and 233 deletions
@@ -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