diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 12:41:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 12:41:46 -0800 |
| commit | 5906374446386fd16fe562b042429d905d231ec3 (patch) | |
| tree | 8e8a9f367d1aeba25c644d3fcf096ffc443c4c5a /net/batman-adv/network-coding.c | |
| parent | 2fb78e89405f4321b86274a0c24b30896dd50529 (diff) | |
| parent | 57b59ed2e5b91e958843609c7884794e29e6c4cb (diff) | |
Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs updates from Chris Mason:
"Some fixes that we've collected from the list.
We still have one more pending to nail down a regression in lzo
compression, but I wanted to get this batch out the door"
* 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: remove ->{get, set}_acl() from btrfs_dir_ro_inode_operations
Btrfs: disable xattr operations on subvolume directories
Btrfs: remove old tree_root case in btrfs_read_locked_inode()
Btrfs: fix truncate down when no_holes feature is enabled
Btrfs: Fix deadlock between direct IO and fast fsync
btrfs: fix false enospc error when truncating heavily reflinked file
Diffstat (limited to 'net/batman-adv/network-coding.c')