The patch titled move-magic-numbers-into-magich-update has been added to the -mm tree. Its filename is move-magic-numbers-into-magich-update.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: move-magic-numbers-into-magich-update From: Nick Black <dank@xxxxxxxxx> Signed-off-by: Nick Black <dank@xxxxxxxxx> Acked-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/hugetlbfs/inode.c | 4 +--- include/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN fs/hugetlbfs/inode.c~move-magic-numbers-into-magich-update fs/hugetlbfs/inode.c --- a/fs/hugetlbfs/inode.c~move-magic-numbers-into-magich-update +++ a/fs/hugetlbfs/inode.c @@ -31,12 +31,10 @@ #include <linux/statfs.h> #include <linux/security.h> #include <linux/ima.h> +#include <linux/magic.h> #include <asm/uaccess.h> -/* some random number */ -#define HUGETLBFS_MAGIC 0x958458f6 - static const struct super_operations hugetlbfs_ops; static const struct address_space_operations hugetlbfs_aops; const struct file_operations hugetlbfs_file_operations; diff -puN include/linux/magic.h~move-magic-numbers-into-magich-update include/linux/magic.h --- a/include/linux/magic.h~move-magic-numbers-into-magich-update +++ a/include/linux/magic.h @@ -13,6 +13,7 @@ #define SECURITYFS_MAGIC 0x73636673 #define SELINUX_MAGIC 0xf97cff8c #define TMPFS_MAGIC 0x01021994 +#define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ #define SQUASHFS_MAGIC 0x73717368 #define EFS_SUPER_MAGIC 0x414A53 #define EXT2_SUPER_MAGIC 0xEF53 _ Patches currently in -mm which might be from dank@xxxxxxxxx are move-magic-numbers-into-magich.patch move-magic-numbers-into-magich-update.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html