From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Jan 2025 16:00:16 +0000 (-0800)
Subject: Merge tag 'caps-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh... 
X-Git-Tag: v6.14-rc1~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=754916d4a2b970bc1b5104d552b5d16ab54954c0;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'caps-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux

Pull capabilities updates from Serge Hallyn:

 - remove the cap_mmap_file() hook, as it simply returned the default
   return value and so doesn't need to exist (Paul Moore)

 - add a trace event for cap_capable() (Jordan Rome)

* tag 'caps-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux:
  security: add trace event for cap_capable
  capabilities: remove cap_mmap_file()
---

754916d4a2b970bc1b5104d552b5d16ab54954c0