From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2016 17:28:45 +0000 (-0700)
Subject: Merge branch 'work.lookups' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: MMI-PSA29.97-13-9~7924
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e34df3344d7b6f284e958147d7225faa340a1f39;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'work.lookups' of git://git./linux/kernel/git/viro/vfs

Pull parallel lookup fixups from Al Viro:
 "Fix for xfs parallel readdir (turns out the cxfs exposure was not
  enough to catch all problems), and a reversion of btrfs back to
  ->iterate() until the fs/btrfs/delayed-inode.c gets fixed"

* 'work.lookups' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  xfs: concurrent readdir hangs on data buffer locks
  Revert "btrfs: switch to ->iterate_shared()"
---

e34df3344d7b6f284e958147d7225faa340a1f39