Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jun 2021 23:20:48 +0000 (16:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jun 2021 23:20:48 +0000 (16:20 -0700)
commita58e203530ebdf6e5413bebc7f976d756188a4b5
tree018d34c1f747bbbc064b303b8f678c79e748249d
parenta60c538ed2ff9d084544a894219eed9c5ab980e5
parent2fc2b430f559fdf32d5d1dd5ceaa40e12fb77bdf
Merge tag 'fscrypt-for-linus' of git://git./fs/fscrypt/fscrypt

Pull fscrypt updates from Eric Biggers:
 "A couple bug fixes for fs/crypto/:

   - Fix handling of major dirhash values that happen to be 0.

   - Fix cases where keys were derived differently on big endian systems
     than on little endian systems (affecting some newer features only)"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fscrypt: fix derivation of SipHash keys on big endian CPUs
  fscrypt: don't ignore minor_hash when hash is 0