No conflicts.
Showing the changes to include/uapi (1 of 746 files). Show all
Unified · Split
| @@ -6,6 +6,7 @@ · 5 unmodified lines | ||
| 6 | 6 | #define AFFS_SUPER_MAGIC 0xadff |
| 7 | 7 | #define AFS_SUPER_MAGIC 0x5346414F |
| 8 | 8 | #define AUTOFS_SUPER_MAGIC 0x0187 |
| 9 | +#define CEPH_SUPER_MAGIC 0x00c36400 | |
| 9 | 10 | #define CODA_SUPER_MAGIC 0x73757245 |
| 10 | 11 | #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ |
| 11 | 12 | #define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */ |