Skip to content
  • Linus Torvalds's avatar
    Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit · a99abce2
    Linus Torvalds authored
    Pull audit updates from Paul Moore:
     "Two small patches from the audit next branch; only one of which has
      any real significant code changes, the other is simply a MAINTAINERS
      update for audit.
    
      The single code patch is pretty small and rather straightforward, it
      changes the audit "version" number reported to userspace from an
      integer to a bitmap which is used to indicate the functionality of the
      running kernel.  This really doesn't have much impact on the kernel,
      but it will make life easier for the audit userspace folks.
    
      Thankfully we were still on a version number which allowed us to do
      this without breaking userspace"
    
    * 'upstream' of git://git.infradead.org/users/pcmoore/audit:
      audit: convert status version to a feature bitmap
      audit: add Paul Moore to the MAINTAINERS entry
    a99abce2