diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 13:41:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 13:41:28 -0800 |
| commit | a99abce2d92dd21faffc9439fa35d1519627872b (patch) | |
| tree | 7ce5848ea9a8fb5a0e84aeb10b37ce93716dc18d /MAINTAINERS | |
| parent | e3aa91a7cb21a595169b20c64f63ca39a91a0c43 (diff) | |
| parent | 0f7e94ee40d06f7a04e039392dfee8244bd8a7e0 (diff) | |
| download | linux-a99abce2d92dd21faffc9439fa35d1519627872b.tar.gz linux-a99abce2d92dd21faffc9439fa35d1519627872b.tar.bz2 linux-a99abce2d92dd21faffc9439fa35d1519627872b.zip | |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1f0ef48830f9..f273cb58d2e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1801,10 +1801,11 @@ S: Supported F: drivers/scsi/esas2r AUDIT SUBSYSTEM +M: Paul Moore <paul@paul-moore.com> M: Eric Paris <eparis@redhat.com> -L: linux-audit@redhat.com (subscribers-only) +L: linux-audit@redhat.com (moderated for non-subscribers) W: http://people.redhat.com/sgrubb/audit/ -T: git git://git.infradead.org/users/eparis/audit.git +T: git git://git.infradead.org/users/pcmoore/audit S: Maintained F: include/linux/audit.h F: include/uapi/linux/audit.h |