Skip to content
Commit fe986f9d authored by Dave Chinner's avatar 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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment