The patch titled Doc: add audit & acct to DocBook has been added to the -mm tree. Its filename is doc-add-audit-acct-to-docbook.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this From: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Fix one audit kernel-doc description (one parameter was missing). Add audit*.c interfaces to DocBook. Add BSD accounting interfaces to DocBook. Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- Documentation/DocBook/kernel-api.tmpl | 12 ++++++++++++ kernel/auditsc.c | 1 + 2 files changed, 13 insertions(+) diff -puN Documentation/DocBook/kernel-api.tmpl~doc-add-audit-acct-to-docbook Documentation/DocBook/kernel-api.tmpl --- devel/Documentation/DocBook/kernel-api.tmpl~doc-add-audit-acct-to-docbook 2006-05-01 18:02:22.000000000 -0700 +++ devel-akpm/Documentation/DocBook/kernel-api.tmpl 2006-05-01 18:02:22.000000000 -0700 @@ -331,6 +331,18 @@ X!Earch/i386/kernel/mca.c !Esecurity/security.c </chapter> + <chapter id="audit"> + <title>Audit Interfaces</title> +!Ekernel/audit.c +!Ikernel/auditsc.c +!Ikernel/auditfilter.c + </chapter> + + <chapter id="accounting"> + <title>Accounting Framework</title> +!Ikernel/acct.c + </chapter> + <chapter id="pmfuncs"> <title>Power Management</title> !Ekernel/power/pm.c diff -puN kernel/auditsc.c~doc-add-audit-acct-to-docbook kernel/auditsc.c --- devel/kernel/auditsc.c~doc-add-audit-acct-to-docbook 2006-05-01 18:02:22.000000000 -0700 +++ devel-akpm/kernel/auditsc.c 2006-05-01 18:02:22.000000000 -0700 @@ -1193,6 +1193,7 @@ ret: * @uid: msgq user id * @gid: msgq group id * @mode: msgq mode (permissions) + * @ipcp: in-kernel IPC permissions * * Returns 0 for success or NULL context or < 0 on error. */ _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are git-kbuild.patch config-exit-if-no-beginning-filename.patch git-mtd.patch lpfc-sparse-null-warnings.patch areca-raid-linux-scsi-driver.patch git-watchdog.patch add-poisonh-and-patch-primary-users.patch update-2-drivers-for-poisonh.patch add-doc-submitchecklist.patch ip2-fix-sections.patch doc-add-audit-acct-to-docbook.patch acpi-identify-which-device-is-not-power-manageable.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html