Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/jmorris/linux-security

Pull maintainer update from James Morris:
 "Please pull this patch which adds Serge as maintainer of the
  capabilities code, as discussed on lwn and the lsm list.

  New capabilities must be signed off by the maintainer, and new uses of
  any capabilities should at be cc'd to the maintainer."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  MAINTAINERS: Add Serge as maintainer of capabilities
  • Loading branch information...
commit 33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0 2 parents 9fc005c + 95d16c7
Linus Torvalds torvalds authored

Showing 1 changed file with 8 additions and 0 deletions. Show diff stats Hide diff stats

  1. +8 0 MAINTAINERS
8 MAINTAINERS
@@ -1721,6 +1721,14 @@ F: include/linux/can/error.h
1721 1721 F: include/linux/can/netlink.h
1722 1722 F: include/linux/can/platform/
1723 1723
  1724 +CAPABILITIES
  1725 +M: Serge Hallyn <serge.hallyn@canonical.com>
  1726 +L: linux-security-module@vger.kernel.org
  1727 +S: Supported
  1728 +F: include/linux/capability.h
  1729 +F: security/capability.c
  1730 +F: security/commoncap.c
  1731 +
1724 1732 CELL BROADBAND ENGINE ARCHITECTURE
1725 1733 M: Arnd Bergmann <arnd@arndb.de>
1726 1734 L: linuxppc-dev@lists.ozlabs.org

0 comments on commit 33e9ee8

Please sign in to comment.
Something went wrong with that request. Please try again.