]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8bff39b 92cfcd0)
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Nov 2020 18:05:37 +0000 (10:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Nov 2020 18:05:37 +0000 (10:05 -0800)
commit52d1998d09af92d44ffce7454637dd3fd1afdc7d
tree635fa3d3bc7233fb21153fcf84ee807c39e4b946tree | snapshot
parent8bff39bfdc30c9bd6e152eb88a0bd6dd35bdd760commit | diff
parent92cfcd030e4b1de11a6b1edb0840e55c26332d31commit | diff
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

Pull fscrypt fix from Eric Biggers:
 "Fix a regression where a new WARN_ON() was reachable when using
  FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32 on ext4, causing xfstest
  generic/602 to sometimes fail on ext4"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fscrypt: remove reachable WARN in fscrypt_setup_iv_ino_lblk_32_key()
Michael's Linux tree.