The patch titled
move-magic-numbers-into-magich-update
has been removed from the -mm tree. Its filename was
move-magic-numbers-into-magich-update.patch
This patch was dropped because it was folded into move-magic-numbers-into-magich.patch
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
