]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'lsm-pr-20260615' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jun 2026 11:34:16 +0000 (12:34 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jun 2026 11:34:16 +0000 (12:34 +0100)
Pull lsm update from Paul Moore:
 "A single LSM update the security_inode_listsecurity() hook to be able
  to leverage the xattr_list_one() helper function.

  We wanted to do this for a while, but we needed to fixup the callers
  in the NFS code first. With the NFS code changes shipping in Linux
  v7.0 and no one complaining, it seemed a good time to complete the
  shift"

* tag 'lsm-pr-20260615' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  security,fs,nfs,net: update security_inode_listsecurity() interface

1  2 
fs/nfs/nfs4proc.c
fs/xattr.c
security/selinux/hooks.c

Simple merge
diff --cc fs/xattr.c
Simple merge
Simple merge