Skip to content
Commit 542c3118 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-dio-extend-fix' into for-next 

Conflicts:
	fs/xfs/xfs_file.c
parents 6a63ef06 0cefb29e
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