From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Jun 2006 22:37:56 +0000 (-0700)
Subject: Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit... 
X-Git-Tag: Ubuntu-5.10.0-12.13~54180
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d9eaec9e295a84a80b663996d0489fcff3a1dca9;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: (25 commits)
  [PATCH] make set_loginuid obey audit_enabled
  [PATCH] log more info for directory entry change events
  [PATCH] fix AUDIT_FILTER_PREPEND handling
  [PATCH] validate rule fields' types
  [PATCH] audit: path-based rules
  [PATCH] Audit of POSIX Message Queue Syscalls v.2
  [PATCH] fix se_sen audit filter
  [PATCH] deprecate AUDIT_POSSBILE
  [PATCH] inline more audit helpers
  [PATCH] proc_loginuid_write() uses simple_strtoul() on non-terminated array
  [PATCH] update of IPC audit record cleanup
  [PATCH] minor audit updates
  [PATCH] fix audit_krule_to_{rule,data} return values
  [PATCH] add filtering by ppid
  [PATCH] log ppid
  [PATCH] collect sid of those who send signals to auditd
  [PATCH] execve argument logging
  [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES
  [PATCH] audit_panic() is audit-internal
  [PATCH] inotify (5/5): update kernel documentation
  ...

Manual fixup of conflict in unclude/linux/inotify.h
---

d9eaec9e295a84a80b663996d0489fcff3a1dca9