Merge branch 'setns'

* setns:
  ns: Wire up the setns system call

Done as a merge to make it easier to fix up conflicts in arm due to
addition of sendmmsg system call

diff --cc arch/arm/include/asm/unistd.h
index 3de689aa6f6840227ecfd2ccc3e79b73cd787ff0,0c5fc55ad8005649daee6f7e1a82d79244f78083..2c04ed5efeb50707ac3353958434d37691841839
--- 1/arch/arm/include/asm/unistd.h
--- 2/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@@ -400,7 -400,7 +400,8 @@@
  #define __NR_open_by_handle_at                (__NR_SYSCALL_BASE+371)
  #define __NR_clock_adjtime            (__NR_SYSCALL_BASE+372)
  #define __NR_syncfs                   (__NR_SYSCALL_BASE+373)
 -#define __NR_setns                    (__NR_SYSCALL_BASE+374)
 +#define __NR_sendmmsg                 (__NR_SYSCALL_BASE+374)
++#define __NR_setns                    (__NR_SYSCALL_BASE+375)
  
  /*
   * The following SWIs are ARM private.

diff --cc arch/arm/kernel/calls.S
index 24cdac3ce2e3e6f8db9c98e480df48b876515b45,a05f75928bea8990ad1c0678e5e309fc2729dc50..80f7896cc0164ad6f74469f1e777b90c1f306443
--- 1/arch/arm/kernel/calls.S
--- 2/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@@ -383,7 -383,7 +383,8 @@@
                CALL(sys_open_by_handle_at)
                CALL(sys_clock_adjtime)
                CALL(sys_syncfs)
 -              CALL(sys_setns)
 +              CALL(sys_sendmmsg)
++/* 375 */     CALL(sys_setns)
  #ifndef syscalls_counted
  .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
  #define syscalls_counted