Subject: + fs-hfs-btreeh-remove-duplicate-defines.patch added to -mm tree To: michael.opdenacker@xxxxxxxxxxxxxxxxxx,hch@xxxxxx,slava@xxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 05 Nov 2013 15:38:21 -0800 The patch titled Subject: fs/hfs/btree.h: remove duplicate defines has been added to the -mm tree. Its filename is fs-hfs-btreeh-remove-duplicate-defines.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-hfs-btreeh-remove-duplicate-defines.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-hfs-btreeh-remove-duplicate-defines.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Michael Opdenacker <michael.opdenacker@xxxxxxxxxxxxxxxxxx> Subject: fs/hfs/btree.h: remove duplicate defines This patch removes duplicate defines from fs/hfs/btree.h Signed-off-by: Michael Opdenacker <michael.opdenacker@xxxxxxxxxxxxxxxxxx> Reviewed-by: Vyacheslav Dubeyko <slava@xxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/hfs/btree.h | 5 ----- 1 file changed, 5 deletions(-) diff -puN fs/hfs/btree.h~fs-hfs-btreeh-remove-duplicate-defines fs/hfs/btree.h --- a/fs/hfs/btree.h~fs-hfs-btreeh-remove-duplicate-defines +++ a/fs/hfs/btree.h @@ -153,11 +153,6 @@ struct hfs_btree_header_rec { u32 reserved3[16]; } __packed; -#define HFS_NODE_INDEX 0x00 /* An internal (index) node */ -#define HFS_NODE_HEADER 0x01 /* The tree header node (node 0) */ -#define HFS_NODE_MAP 0x02 /* Holds part of the bitmap of used nodes */ -#define HFS_NODE_LEAF 0xFF /* A leaf (ndNHeight==1) node */ - #define BTREE_ATTR_BADCLOSE 0x00000001 /* b-tree not closed properly. not used by hfsplus. */ #define HFS_TREE_BIGKEYS 0x00000002 /* key length is u16 instead of u8. _ Patches currently in -mm which might be from michael.opdenacker@xxxxxxxxxxxxxxxxxx are drivers-cdrom-gdromc-remove-deprecated-irqf_disabled.patch cramfs-mark-as-obsolete.patch init-make-init-failures-more-explicit.patch linux-next.patch scripts-tagssh-remove-obsolete-__devinit.patch fs-hfs-btreeh-remove-duplicate-defines.patch fs-hfs-btreeh-remove-duplicate-defines-fix.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