projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86e98ed 644f174)
Merge tag 'integrity-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Apr 2023 17:11:32 +0000 (10:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Apr 2023 17:11:32 +0000 (10:11 -0700)
Pull integrity update from Mimi Zohar:
 "Just one one bug fix. Other integrity changes are being upstreamed via
  the tpm and lsm trees"

* tag 'integrity-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  IMA: allow/fix UML builds


Trivial merge
Linux 6.x block layer and io_uring tree(s)