summaryrefslogtreecommitdiff
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2018-10-29 19:19:29 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2018-10-29 19:19:29 -0400
commit319829cc2bded42d163651b0575ec6371d8a5420 (patch)
treee95a04e5e3fc1196aea05ef7639c0589a65815eb /fs/ecryptfs
parent3df629d873f8683af6f0d34dfc743f637966d483 (diff)
parentd1b75e8a6d016fee58712b83bfd0f4cef95ebb13 (diff)
parent8a68060cefa6db0e02600ac35deed0dc2fa6a68f (diff)
parent69374d063be08d8016287cdabaa15e2058b337ac (diff)
parent3642b29a63674020401e41185ed5b0e3c056ab4a (diff)
parent1a16dbaf798c5b68ac767444eb045e6f3adaa16d (diff)
downloadlinux-next-319829cc2bded42d163651b0575ec6371d8a5420.tar.gz
Merge branches 'work.mount', 'work.alpha', 'work.compat', 'work.misc' and 'work.lookup' into for-next