Merge branch 'compat.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull compat mount cleanups from Al Viro:
 "The last remnants of mount(2) compat buried by Christoph.

  Buried into NFS, that is.

  Generally I'm less enthusiastic about "let's use in_compat_syscall()
  deep in call chain" kind of approach than Christoph seems to be, but
  in this case it's warranted - that had been an NFS-specific wart,
  hopefully not to be repeated in any other filesystems (read: any new
  filesystem introducing non-text mount options will get NAKed even if
  it doesn't mess the layout up).

  IOW, not worth trying to grow an infrastructure that would avoid that
  use of in_compat_syscall()..."

* 'compat.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: remove compat_sys_mount
  fs,nfs: lift compat nfs4 mount data handling into the nfs code
  nfs: simplify nfs4_parse_monolithic

diff --cc arch/arm64/include/asm/unistd32.h
Simple merge

diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
Simple merge

diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
Simple merge

diff --cc arch/parisc/kernel/syscalls/syscall.tbl
Simple merge

diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
Simple merge

diff --cc arch/s390/kernel/syscalls/syscall.tbl
Simple merge

diff --cc arch/sparc/kernel/syscalls/syscall.tbl
Simple merge

diff --cc arch/x86/entry/syscalls/syscall_32.tbl
Simple merge

diff --cc fs/namespace.c
index 32a0b91,12b431b..294e05a
--- 1/fs/namespace.c
--- 2/fs/namespace.c
+++ b/fs/namespace.c
@@@ -3072,10 -3072,10 +3072,10 @@@ static void shrink_submounts(struct mou
        }
  }
  
- void *copy_mount_options(const void __user * data)
+ static void *copy_mount_options(const void __user * data)
  {
        char *copy;
 -      unsigned size;
 +      unsigned left, offset;
  
        if (!data)
                return NULL;

diff --cc fs/nfs/fs_context.c
Simple merge

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

diff --cc include/uapi/asm-generic/unistd.h
Simple merge

diff --cc tools/include/uapi/asm-generic/unistd.h
Simple merge

diff --cc tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
Simple merge

diff --cc tools/perf/arch/s390/entry/syscalls/syscall.tbl
Simple merge