Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Jan 2019 20:21:11 +0000 (12:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Jan 2019 20:21:11 +0000 (12:21 -0800)
commitbaa6707381285e68cc472efba58e7e736057aacc
treea5687bdc023a250ce089355d3032043708da8807
parent215240462a9672db771bb60adcc1c4fdf40e8ec4
parent8094c3ceb21ad93896fd4d238e8ba41911932eaf
Merge tag 'fscrypt_for_linus' of git://git./linux/kernel/git/tytso/fscrypt

Pull fscrypt updates from Ted Ts'o:
 "Add Adiantum support for fscrypt"

* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
  fscrypt: add Adiantum support
include/uapi/linux/fs.h