Merge branch 'master' into next

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

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

diff --cc kernel/ptrace.c
Simple merge