Merge branch 'next' into for-linus

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

diff --cc fs/jfs/namei.c
Simple merge

diff --cc fs/open.c
Simple merge

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

diff --cc kernel/sysctl.c
Simple merge