The patch titled mm: fix in kerneldoc has been added to the -mm tree. Its filename is mm-fix-in-kerneldoc.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: mm: fix in kerneldoc From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx> Fixes an kerneldoc error. Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx> Cc: "Randy.Dunlap" <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- mm/filemap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/filemap.c~mm-fix-in-kerneldoc mm/filemap.c --- a/mm/filemap.c~mm-fix-in-kerneldoc +++ a/mm/filemap.c @@ -1139,11 +1139,11 @@ success: } /** - * __generic_file_aio_read - generic filesystem read routine + * generic_file_aio_read - generic filesystem read routine * @iocb: kernel I/O control block * @iov: io vector request * @nr_segs: number of segments in the iovec - * @ppos: current file position + * @pos: current file position * * This is the "read()" routine for all filesystems * that can use the page cache directly. _ Patches currently in -mm which might be from henne@xxxxxxxxxxxxxxxx are origin.patch git-scsi-misc.patch scsi-convert-ninja-driver-to-struct-scsi_cmnd.patch mm-fix-in-kerneldoc.patch pci_module_init-convertion-in-ata_genericc.patch pci_module_init-convertion-in-ata_genericc-fix.patch pci_module_init-convertion-in-amso1100-driver.patch pci_module_init-convertion-for-k8_edacc.patch pci_module_init-convertion-in-the-legacy-megaraid-driver.patch pci_module_init-convertion-in-olympicc.patch pci_module_init-conversion-for-pata_pdc2027x.patch pci_module_init-convertion-in-tmscsimc.patch mark-pci_module_init-deprecated.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