Skip to content
GitLab
Explore
Sign in
Register
Commit
fe986f9d
authored
Mar 13, 2014
by
Dave Chinner
Browse files
Merge branch 'xfs-O_TMPFILE-support' into for-next
Conflicts: fs/xfs/xfs_trans_resv.c - fix for XFS_INODE_CLUSTER_SIZE macro removal
parents
5f44e4c1
ab297431
Loading
Loading
Loading
Changes
7
Hide whitespace changes
Inline
Side-by-side
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment