diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 17:07:35 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 17:07:35 (GMT) |
| commit | f6167514c819cb7794e60cf36b9466598a789013 (patch) | |
| tree | 53cd063b30ad8314d57f1a58a4c2d27b968a55f2 /mm/slub.c | |
| parent | 2cd0b50a189febfe1855b13be98297a621864741 (diff) | |
| parent | 570dd45042a7c8a7aba1ee029c5dd0f5ccf41b9b (diff) | |
| download | linux-f6167514c819cb7794e60cf36b9466598a789013.tar.xz | |
Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"My patch fixes the btrfs list_head abuse that we tracked down during
Dave Jones' memory corruption investigation. With both Jens and my
patches in place, I'm no longer able to trigger problems.
Filipe is fixing a difficult old bug between snapshots, balance and
send. Dave is cooking a few more for the next rc, but these are tested
and ready"
* 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: fix races on root_log_ctx lists
btrfs: fix incremental send failure caused by balance
Diffstat (limited to 'mm/slub.c')
0 files changed, 0 insertions, 0 deletions