diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-01-27 23:54:16 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-01-27 23:54:16 +0300 |
| commit | 72d044e4bfa6bd9096536e2e1c62aecfe1a525e4 (patch) | |
| tree | 0e408f181f5c704ff43cd006f4643c339e04aff1 /include/uapi | |
| parent | e2cf07654efb0fd7bbcb475c6f74be7b5755a8fd (diff) | |
| parent | 23a46422c56144939c091c76cf389aa863ce9c18 (diff) | |
| download | linux-72d044e4bfa6bd9096536e2e1c62aecfe1a525e4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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 dae5df88ab10..0425cd79af9a 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -6,6 +6,7 @@ #define AFFS_SUPER_MAGIC 0xadff #define AFS_SUPER_MAGIC 0x5346414F #define AUTOFS_SUPER_MAGIC 0x0187 +#define CEPH_SUPER_MAGIC 0x00c36400 #define CODA_SUPER_MAGIC 0x73757245 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ #define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */ |