diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
commit | 89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch) | |
tree | 0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /fs/ceph/file.c | |
parent | x86/dumpstack: Handle NULL stack pointer in show_trace_log_lvl() (diff) | |
parent | x86/cpufeatures: Enable new AVX512 cpu features (diff) | |
download | linux-dev-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.xz linux-dev-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip |
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ceph/file.c')
-rw-r--r-- | fs/ceph/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 18630e800208..f995e3528a33 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1770,7 +1770,6 @@ const struct file_operations ceph_file_fops = { .fsync = ceph_fsync, .lock = ceph_lock, .flock = ceph_flock, - .splice_read = generic_file_splice_read, .splice_write = iter_file_splice_write, .unlocked_ioctl = ceph_ioctl, .compat_ioctl = ceph_ioctl, |