History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Jakub Kicinski committed 4 years ago

Commit 72d044e2 parents e2cf076 23a4642746 files · +11394 −7993Browse files

Showing the changes to include/uapi (1 of 746 files). Show all

Unified · Split

include/uapi/linux/magic.h+1−0
@@ -6,6 +6,7 @@ · 5 unmodified lines
6#define AFFS_SUPER_MAGIC 0xadff6#define AFFS_SUPER_MAGIC 0xadff
7#define AFS_SUPER_MAGIC 0x5346414F7#define AFS_SUPER_MAGIC 0x5346414F
8#define AUTOFS_SUPER_MAGIC 0x01878#define AUTOFS_SUPER_MAGIC 0x0187
9#define CEPH_SUPER_MAGIC 0x00c36400
9#define CODA_SUPER_MAGIC 0x7375724510#define CODA_SUPER_MAGIC 0x73757245
10#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */11#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
11#define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */12#define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */