]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge tag 'lsm-pr-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jul 2025 01:20:32 +0000 (18:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jul 2025 01:20:32 +0000 (18:20 -0700)
commit30b9dcae9815ae7e752fe3aa00aa283fadf16c6a
tree4054b19b9351c1766b135e1a8cab9f2704ab6923
parent4d40b59d8b0568769d10ac9b2a97e0af0a39d371
parent5d8b97c946777118930e1cfb075cab59a139ca7c
Merge tag 'lsm-pr-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm

Pull lsm updates from Paul Moore:

 - Add Nicolas Bouchinet and Xiu Jianfeng as Lockdown maintainers

   The Lockdown LSM has been without a dedicated mantainer since its
   original acceptance upstream, and it has suffered as a result.
   Thankfully we have two new volunteers who together I believe have the
   background and desire to help ensure Lockdown is properly supported.

 - Remove the unused cap_mmap_file() declaration

* tag 'lsm-pr-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  MAINTAINERS: Add Xiu and myself as Lockdown maintainers
  security: Remove unused declaration cap_mmap_file()
  lsm: trivial comment fix
MAINTAINERS
include/linux/security.h
security/security.c