diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-20 20:21:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-20 20:21:05 -0700 |
| commit | da83fc6e0f379bf80d68d34cca38788a046a71f4 (patch) | |
| tree | 8ea6f2b69f8d899c2bb49f0445a93c4f232252ea /usr | |
| parent | 90d51d56069f8c63b043bacf55c62a98df88ef67 (diff) | |
| parent | 0bfaa9c5cb479cebc24979b384374fe47500b4c9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"We have two more fixes in my for-linus branch.
I was hoping to also include a fix for a btrfs deadlock with
compression enabled, but we're still nailing that one down"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: test for valid bdev before kobj removal in btrfs_rm_device
Btrfs: fix abnormal long waiting in fsync
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions