| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 18 Jul 2015 04:46:57 +0000 (21:46 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 18 Jul 2015 04:46:57 +0000 (21:46 -0700) | ||
| commit | 8be5701342790eb42c67f4f8609e203d6a461a4a | |
| tree | 5791328ce0ce868ea79c21911a232dcf3d2efe68 | tree | snapshot (tar.xz tar.gz zip) |
| parent | dfe91c9766578f2ec24ebf53b7fd07e288f170d1 | commit | diff |
| parent | ed958762644b404654a6f5d23e869f496fe127c6 | commit | diff |
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
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