]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'xfs-O_TMPFILE-support' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 13 Mar 2014 08:14:43 +0000 (19:14 +1100)
committerDave Chinner <david@fromorbit.com>
Thu, 13 Mar 2014 08:14:43 +0000 (19:14 +1100)
commit21c8789938cb11a7e5cda76ef8812ee58315a9ac
tree73be54e2c5378750dee0ebc0720af5143d2c4dc6
parent01af7f4ff94001d04955b7dfb1b00e2e328b9cdc
parent8e5c31fda9606159135f86a2ed9d9aa37bde2021
Merge branch 'xfs-O_TMPFILE-support' into for-next

Conflicts:
fs/xfs/xfs_trans_resv.c
- fix for XFS_INODE_CLUSTER_SIZE macro removal
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode.h
fs/xfs/xfs_iops.c
fs/xfs/xfs_symlink.c
fs/xfs/xfs_trans_resv.c
fs/xfs/xfs_trans_resv.h