Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

Pull namespace updates from Eric Biederman:
 "This is a bunch of small changes built against 3.16-rc6.  The most
  significant change for users is the first patch which makes setns
  drmatically faster by removing unneded rcu handling.

  The next chunk of changes are so that "mount -o remount,.." will not
  allow the user namespace root to drop flags on a mount set by the
  system wide root.  Aks this forces read-only mounts to stay read-only,
  no-dev mounts to stay no-dev, no-suid mounts to stay no-suid, no-exec
  mounts to stay no exec and it prevents unprivileged users from messing
  with a mounts atime settings.  I have included my test case as the
  last patch in this series so people performing backports can verify
  this change works correctly.

  The next change fixes a bug in NFS that was discovered while auditing
  nsproxy users for the first optimization.  Today you can oops the
  kernel by reading /proc/fs/nfsfs/{servers,volumes} if you are clever
  with pid namespaces.  I rebased and fixed the build of the
  !CONFIG_NFS_FS case yesterday when a build bot caught my typo.  Given
  that no one to my knowledge bases anything on my tree fixing the typo
  in place seems more responsible that requiring a typo-fix to be
  backported as well.

  The last change is a small semantic cleanup introducing
  /proc/thread-self and pointing /proc/mounts and /proc/net at it.  This
  prevents several kinds of problemantic corner cases.  It is a
  user-visible change so it has a minute chance of causing regressions
  so the change to /proc/mounts and /proc/net are individual one line
  commits that can be trivially reverted.  Unfortunately I lost and
  could not find the email of the original reporter so he is not
  credited.  From at least one perspective this change to /proc/net is a
  refgression fix to allow pthread /proc/net uses that were broken by
  the introduction of the network namespace"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  proc: Point /proc/mounts at /proc/thread-self/mounts instead of /proc/self/mounts
  proc: Point /proc/net at /proc/thread-self/net instead of /proc/self/net
  proc: Implement /proc/thread-self to point at the directory of the current thread
  proc: Have net show up under /proc/<tgid>/task/<tid>
  NFS: Fix /proc/fs/nfsfs/servers and /proc/fs/nfsfs/volumes
  mnt: Add tests for unprivileged remount cases that have found to be faulty
  mnt: Change the default remount atime from relatime to the existing value
  mnt: Correct permission checks in do_remount
  mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into do_remount
  mnt: Only change user settable mount flags in remount
  namespaces: Use task_lock and not rcu to protect nsproxy

diff --cc fs/namespace.c
Simple merge

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

diff --cc fs/nfs/internal.h
Simple merge

diff --cc fs/proc/base.c
index 043c83cb51f935920cc013846efab7ba853c9077,0131156ce7c984a75de9efc5e7d9b1a1fc3d9b4d..baf852b648ad7d2b4512d7279d5e97a0fb473cb6
--- 1/fs/proc/base.c
--- 2/fs/proc/base.c
+++ b/fs/proc/base.c
@@@ -2862,11 -2900,14 +2867,14 @@@ static const struct pid_entry tid_base_
        DIR("fd",        S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
        DIR("fdinfo",    S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fdinfo_operations),
        DIR("ns",        S_IRUSR|S_IXUGO, proc_ns_dir_inode_operations, proc_ns_dir_operations),
+ #ifdef CONFIG_NET
+       DIR("net",        S_IRUGO|S_IXUGO, proc_net_inode_operations, proc_net_operations),
+ #endif
        REG("environ",   S_IRUSR, proc_environ_operations),
 -      INF("auxv",      S_IRUSR, proc_pid_auxv),
 +      ONE("auxv",      S_IRUSR, proc_pid_auxv),
        ONE("status",    S_IRUGO, proc_pid_status),
        ONE("personality", S_IRUSR, proc_pid_personality),
 -      INF("limits",    S_IRUGO, proc_pid_limits),
 +      ONE("limits",    S_IRUGO, proc_pid_limits),
  #ifdef CONFIG_SCHED_DEBUG
        REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),
  #endif

diff --cc fs/proc/internal.h
Simple merge

diff --cc fs/proc/root.c
Simple merge

diff --cc tools/testing/selftests/Makefile
index 6fd2a440206964beb15e9579cb7a5652b518175a,0a8a9db43d34fff00d567028df1c7b7bef1969aa..36ff2e4c7b6f251211d04f6d9ce7f1f7bff500eb
--- 1/tools/testing/selftests/Makefile
--- 2/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -2,9 -2,9 +2,10 @@@ TARGETS = breakpoint
  TARGETS += cpu-hotplug
  TARGETS += efivarfs
  TARGETS += kcmp
 +TARGETS += memfd
  TARGETS += memory-hotplug
  TARGETS += mqueue
+ TARGETS += mount
  TARGETS += net
  TARGETS += ptrace
  TARGETS += timers