From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jan 2015 01:27:18 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v3.19-rc6~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=80a755545d54c8e9fd801f0de3d015defd825659;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "A couple of fixes - deadlock in CIFS and build breakage in cris serial
  driver (resurfaced f_dentry in there)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  VFS: Convert file->f_dentry->d_inode to file_inode()
  fix deadlock in cifs_ioctl_clone()
---

80a755545d54c8e9fd801f0de3d015defd825659