]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commitfebf9ee3d2f37a772802fffb6e17c0e35a52e1f1
treeaaec2dc987eddc4de4d0ba6a574621ed8a22830ftree
parent86e98ed15b3e34460d1b3095bd119b6fac11841ccommit | diff
parent644f17412f5acf01a19af9d04a921937a2bc86c6commit | diff
Merge tag 'integrity-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

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
Unnamed repository; edit this file 'description' to name the repository.