From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Oct 2016 17:07:35 +0000 (-0700)
Subject: Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: microblaze-4.10-rc1~85
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=f6167514c819cb7794e60cf36b9466598a789013;p=linux-2.6-microblaze.git

Merge branch 'for-linus-4.9' of git://git./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
---

f6167514c819cb7794e60cf36b9466598a789013