diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-18 06:46:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-18 06:46:57 +0200 |
| commit | 8be5701342790eb42c67f4f8609e203d6a461a4a (patch) | |
| tree | 5791328ce0ce868ea79c21911a232dcf3d2efe68 /fs/proc/generic.c | |
| parent | Merge tag 'rtc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abell... (diff) | |
| parent | Btrfs: fix file corruption after cloning inline extents (diff) | |
| download | linux-8be5701342790eb42c67f4f8609e203d6a461a4a.tar.xz linux-8be5701342790eb42c67f4f8609e203d6a461a4a.zip | |
Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"These are all from Filipe, and cover a few problems we've had reported
on the list recently (along with ones he found on his own)"
* 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix file corruption after cloning inline extents
Btrfs: fix order by which delayed references are run
Btrfs: fix list transaction->pending_ordered corruption
Btrfs: fix memory leak in the extent_same ioctl
Btrfs: fix shrinking truncate when the no_holes feature is enabled
Diffstat (limited to 'fs/proc/generic.c')
0 files changed, 0 insertions, 0 deletions