]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit983ca33c57d25c2da5154814c78f3822b720e94f
treea5687bdc023a250ce089355d3032043708da8807
parent89efca0e1a857abfd89c4ce69f003fc82b09041a
parenta28ebcafabd9242a8a0324376fe9819520ff1dbf
Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/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