Merge branch 'work.openat2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro...
authorJens Axboe <axboe@kernel.dk>
Tue, 7 Jan 2020 16:37:20 +0000 (09:37 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 7 Jan 2020 16:37:20 +0000 (09:37 -0700)
commitbf11dcf690463caa5aad8e244456932108871009
tree87c25aa88ccdb60229262d5cd2879e99970661d5
parentc79f46a282390e0f5b306007bf7b11a46d529538
parentb767b87044c4b15c4f222daf6948a7a43f802f7e
Merge branch 'work.openat2' of git://git./linux/kernel/git/viro/vfs into for-5.6/io_uring-vfs

Merge in the openat2 branch from Viro, to resolve conflicts with adding
a new namei LOOKUP_ flags.

* 'work.openat2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  Documentation: path-lookup: include new LOOKUP flags
  selftests: add openat2(2) selftests
  open: introduce openat2(2) syscall
  namei: LOOKUP_{IN_ROOT,BENEATH}: permit limited ".." resolution
  namei: LOOKUP_IN_ROOT: chroot-like scoped resolution
  namei: LOOKUP_BENEATH: O_BENEATH-like scoped resolution
  namei: LOOKUP_NO_XDEV: block mountpoint crossing
  namei: LOOKUP_NO_MAGICLINKS: block magic-link resolution
  namei: LOOKUP_NO_SYMLINKS: block symlink resolution
  namei: allow set_root() to produce errors
  namei: allow nd_jump_link() to produce errors
  nsfs: clean-up ns_get_path() signature to return int
  namei: only return -ECHILD from follow_dotdot_rcu()
fs/nsfs.c
include/linux/syscalls.h
kernel/events/core.c
security/apparmor/apparmorfs.c