summary refs log tree commit diff
path: root/include/keys
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-22 13:11:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-22 13:11:15 -0700
commit243d50678583100855862bc084b8b307eea67f68 (patch)
tree41beaa15e0a099211904f685c8fdb91382087656 /include/keys
parent9f15dec81339a76d91daebc53021daf56b8b15b9 (diff)
parent6986c012faa480fb0fda74eaae9abb22f7ad1004 (diff)
downloadlinux-243d50678583100855862bc084b8b307eea67f68.tar.gz
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
Pull overlayfs updates from Miklos Szeredi:
 "Various fixes and tweaks"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: cleanup unused var in rename2
  ovl: rename is_merge to is_lowest
  ovl: fixed coding style warning
  ovl: Ensure upper filesystem supports d_type
  ovl: Warn on copy up if a process has a R/O fd open to the lower file
  ovl: honor flag MS_SILENT at mount
  ovl: verify upper dentry before unlink and rename
Diffstat (limited to 'include/keys')
0 files changed, 0 insertions, 0 deletions