[JFFS2][XATTR] Unify each file header part with any jffs2 file.

Unify each file header part with any jffs2 file.

[7/10] jffs2-xattr-v5.1-07-unify_file_header.patch

Signed-off-by: KaiGai Kohei <kaigai@ak.jp.nec.com>

diff --cc fs/jffs2/acl.c
Simple merge

diff --cc fs/jffs2/acl.h
Simple merge

diff --cc fs/jffs2/security.c
Simple merge

diff --cc fs/jffs2/xattr.c
Simple merge

diff --cc fs/jffs2/xattr.h
Simple merge

diff --cc fs/jffs2/xattr_trusted.c
Simple merge

diff --cc fs/jffs2/xattr_user.c
Simple merge