Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux

Pull fscrypt updates from Eric Biggers:
 "Make fs/crypto/ use the HMAC-SHA512 library functions instead of
  crypto_shash.

  This is simpler, faster, and more reliable"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
  fscrypt: use HMAC-SHA512 library for HKDF
  fscrypt: Remove redundant __GFP_NOWARN

diff --cc fs/crypto/bio.c
Simple merge

diff --cc fs/crypto/fname.c
Simple merge

diff --cc fs/crypto/fscrypt_private.h
Simple merge

diff --cc fs/crypto/hooks.c
Simple merge

diff --cc fs/crypto/keysetup.c
Simple merge

diff --cc fs/crypto/policy.c
Simple merge