The patch titled Subject: mm: fix <linux/pagemap.h> stray kernel-doc notation has been added to the -mm tree. Its filename is mm-fix-linux-pagemaph-stray-kernel-doc-notation.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-fix-linux-pagemaph-stray-kernel-doc-notation.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-fix-linux-pagemaph-stray-kernel-doc-notation.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Subject: mm: fix <linux/pagemap.h> stray kernel-doc notation Delete stray (second) function description in find_lock_page() kernel-doc notation. Note: scripts/kernel-doc just ignores the second function description. Fixes: 2457aec63745e ("mm: non-atomically mark page accessed during page cache allocation where possible") Link: http://lkml.kernel.org/r/b037e9a3-516c-ec02-6c8e-fa5479747ba6@xxxxxxxxxxxxx Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Reported-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/pagemap.h | 1 - 1 file changed, 1 deletion(-) diff -puN include/linux/pagemap.h~mm-fix-linux-pagemaph-stray-kernel-doc-notation include/linux/pagemap.h --- a/include/linux/pagemap.h~mm-fix-linux-pagemaph-stray-kernel-doc-notation +++ a/include/linux/pagemap.h @@ -266,7 +266,6 @@ static inline struct page *find_get_page /** * find_lock_page - locate, pin and lock a pagecache page - * pagecache_get_page - find and get a page reference * @mapping: the address_space to search * @offset: the page index * _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxxx are mm-fix-filemapc-kernel-doc-warnings.patch mm-fix-linux-pagemaph-stray-kernel-doc-notation.patch fonts-keep-non-sparc-fonts-listed-together.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