Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-next

Browse source

Conflicts:
	include/linux/fs.h

...

This commit is contained in:

Al Viro 2015-08-21 02:31:20 -04:00

parent b5f5914cb8 ac05fbb400

commit 061f98e959

12 changed files with 128 additions and 88 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

12

include/linux/fs.h

View file

4

include/linux/fsnotify_backend.h

View file

5

include/linux/list.h

View file