Merge branch 'xfs-rename-whiteout' into for-next

Browse source

Conflicts:
	fs/xfs/xfs_inode.c

...

This commit is contained in:

Dave Chinner 2015-03-25 14:29:13 +11:00

parent 88e8fda99a 7dcf5c3e45

commit d41bb03444

2 changed files with 239 additions and 171 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

418

fs/xfs/xfs_inode.c

View file

2

fs/xfs/xfs_iops.c

View file