| commit | f583381f506dc53b9d3e98cf9d6577323eb3fcd2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 26 17:40:30 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 26 17:40:30 2015 -0700 |
| tree | 5a53895acd1d3c6adab886910399780dd95d65e3 | |
| parent | 59953fba87e5e535657403cc6439d24187929559 [diff] | |
| parent | a3bdccc4e683f0ac69230707ed3fa20e7cf73a79 [diff] |
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "Filipe hit two problems in my block group cache patches. We finalized the fixes last week and ran through more tests" * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: prevent list corruption during free space cache processing Btrfs: fix inode cache writeout