The patch titled reiserfs: remove double definitions of xattr macros has been added to the -mm tree. Its filename is reiserfs-remove-double-definitions-of-xattr-macros.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://www.zip.com.au/~akpm/linux/patches/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: reiserfs: remove double definitions of xattr macros From: Shen Feng <shen@xxxxxxxxxxxxxx> remove the definitions of macros: XATTR_SECURITY_PREFIX XATTR_TRUSTED_PREFIX XATTR_USER_PREFIX since they are defined in linux/xattr.h Signed-off-by: Shen Feng <shen@xxxxxxxxxxxxxx> Signed-off-by: Mingming Cao <cmm@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiserfs/xattr_security.c | 2 -- fs/reiserfs/xattr_trusted.c | 2 -- fs/reiserfs/xattr_user.c | 2 -- 3 files changed, 6 deletions(-) diff -puN fs/reiserfs/xattr_security.c~reiserfs-remove-double-definitions-of-xattr-macros fs/reiserfs/xattr_security.c --- a/fs/reiserfs/xattr_security.c~reiserfs-remove-double-definitions-of-xattr-macros +++ a/fs/reiserfs/xattr_security.c @@ -6,8 +6,6 @@ #include <linux/reiserfs_xattr.h> #include <asm/uaccess.h> -#define XATTR_SECURITY_PREFIX "security." - static int security_get(struct inode *inode, const char *name, void *buffer, size_t size) { diff -puN fs/reiserfs/xattr_trusted.c~reiserfs-remove-double-definitions-of-xattr-macros fs/reiserfs/xattr_trusted.c --- a/fs/reiserfs/xattr_trusted.c~reiserfs-remove-double-definitions-of-xattr-macros +++ a/fs/reiserfs/xattr_trusted.c @@ -7,8 +7,6 @@ #include <linux/reiserfs_xattr.h> #include <asm/uaccess.h> -#define XATTR_TRUSTED_PREFIX "trusted." - static int trusted_get(struct inode *inode, const char *name, void *buffer, size_t size) { diff -puN fs/reiserfs/xattr_user.c~reiserfs-remove-double-definitions-of-xattr-macros fs/reiserfs/xattr_user.c --- a/fs/reiserfs/xattr_user.c~reiserfs-remove-double-definitions-of-xattr-macros +++ a/fs/reiserfs/xattr_user.c @@ -10,8 +10,6 @@ # include <linux/reiserfs_acl.h> #endif -#define XATTR_USER_PREFIX "user." - static int user_get(struct inode *inode, const char *name, void *buffer, size_t size) { _ Patches currently in -mm which might be from shen@xxxxxxxxxxxxxx are linux-next.patch ext3-improve-some-code-in-rb-tree-part-of-dirc.patch ext4-error-proc-entry-creation-when-the-fs-ext4-is-not-correctly-created.patch ext4-improve-some-code-in-rb-tree-part-of-dirc.patch ext4-remove-double-definitions-of-xattr-macros.patch ext4-error-processing-and-coding-enhancement-for-mballoc.patch reiserfs-remove-double-definitions-of-xattr-macros.patch ext2-remove-double-definitions-of-xattr-macros.patch ext3-remove-double-definitions-of-xattr-macros.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