Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 0 insertions, 7 deletions

diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 52e59bf4aa5f..f024d8aaddef 100644
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -55,12 +55,6 @@ static unsigned int bad_file_poll(struct file *filp, poll_table *wait)
         return POLLERR;
 }
 
-static int bad_file_ioctl (struct inode *inode, struct file *filp,
-                        unsigned int cmd, unsigned long arg)
-{
-        return -EIO;
-}
-
 static long bad_file_unlocked_ioctl(struct file *file, unsigned cmd,
                         unsigned long arg)
 {
@@ -159,7 +153,6 @@ static const struct file_operations bad_file_ops =
         .aio_write      = bad_file_aio_write,
         .readdir        = bad_file_readdir,
         .poll           = bad_file_poll,
-        .ioctl          = bad_file_ioctl,
         .unlocked_ioctl = bad_file_unlocked_ioctl,
         .compat_ioctl   = bad_file_compat_ioctl,
         .mmap           = bad_file_mmap,