diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-26 02:27:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-26 02:27:18 +0100 |
| commit | 80a755545d54c8e9fd801f0de3d015defd825659 (patch) | |
| tree | 91005c6d92ef474f8f3ee22c9deb51cc5517ee87 /fs/xfs/xfs_sysfs.c | |
| parent | Merge tag 'dm-3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | VFS: Convert file->f_dentry->d_inode to file_inode() (diff) | |
| download | linux-80a755545d54c8e9fd801f0de3d015defd825659.tar.xz linux-80a755545d54c8e9fd801f0de3d015defd825659.zip | |
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()
Diffstat (limited to 'fs/xfs/xfs_sysfs.c')
0 files changed, 0 insertions, 0 deletions