Merge branch 'for-linus' into work.misc

2016-01-08 21:20:11 -05:00
parent a1c6f05733 a7f61e89af
commit 6108209c4a
77 changed files with 859 additions and 572 deletions
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2766,8 +2766,6 @@ extern int vfs_lstat(const char __user *, struct kstat *);
 extern int vfs_fstat(unsigned int, struct kstat *);
 extern int vfs_fstatat(int , const char __user *, struct kstat *, int);

-extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
-		    unsigned long arg);
 extern int __generic_block_fiemap(struct inode *inode,
 				  struct fiemap_extent_info *fieinfo,
 				  loff_t start, loff_t len,