Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next

diff --cc fs/read_write.c
index dadf24e5c95bb7004d105f0773430576bfc57cf5,dadf24e5c95bb7004d105f0773430576bfc57cf5,324ec271cc4e64868c34e3ff2f28ac2c0542475e,07c53db04ec1ead8135f64ba0c456cd49a72078a..cf377cf9dfe3824ea58c90321940b938b1a5ab1b
--- 1/fs/read_write.c
--- 2/fs/read_write.c
--- 3/fs/read_write.c
--- 4/fs/read_write.c
+++ b/fs/read_write.c
@@@@@ -1188,8 -1188,8 -1187,8 -1275,21 +1276,21 @@@@@ COMPAT_SYSCALL_DEFINE5(pwritev, compat_
    {
        loff_t pos = ((loff_t)pos_high << 32) | pos_low;
    
---     return __compat_sys_pwritev64(fd, vec, vlen, pos);
+++     return do_compat_pwritev64(fd, vec, vlen, pos, 0);
++  }
+++ 
+++ COMPAT_SYSCALL_DEFINE6(pwritev2, compat_ulong_t, fd,
+++             const struct compat_iovec __user *,vec,
+++             compat_ulong_t, vlen, u32, pos_low, u32, pos_high, int, flags)
+++ {
+++     loff_t pos = ((loff_t)pos_high << 32) | pos_low;
+++ 
+++     if (pos == -1)
+++             return do_compat_writev(fd, vec, vlen, flags);
+++ 
+++     return do_compat_pwritev64(fd, vec, vlen, pos, flags);
  + }
+++ 
    #endif
    
    static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,

diff --cc fs/splice.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/uapi/linux/fs.h
Simple merge