From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jun 2016 15:53:38 +0000 (-0700)
Subject: Merge branch 'for-linus-4.7-part2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.7-rc5~2
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=da2f6aba4a21f8da3331e5251a117c52764da579

Merge branch 'for-linus-4.7-part2' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes part 2 from Chris Mason:
 "This has one patch from Omar to bring iterate_shared back to btrfs.

  We have a tree of work we queue up for directory items and it doesn't
  lend itself well to shared access.  While we're cleaning it up, Omar
  has changed things to use an exclusive lock when there are delayed
  items"

* 'for-linus-4.7-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix ->iterate_shared() by upgrading i_rwsem for delayed nodes
---

da2f6aba4a21f8da3331e5251a117c52764da579