From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Jul 2025 01:20:32 +0000 (-0700)
Subject: Merge tag 'lsm-pr-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30b9dcae9815ae7e752fe3aa00aa283fadf16c6a;p=thirdparty%2Flinux.git

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
---

30b9dcae9815ae7e752fe3aa00aa283fadf16c6a