The patch titled
Subject: mm/swap.c: make functions and their kernel-doc agree (again)
has been added to the -mm tree. Its filename is
mm-swapc-make-functions-and-their-kernel-doc-agree-again.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-swapc-make-functions-and-their-kernel-doc-agree-again.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-swapc-make-functions-and-their-kernel-doc-agree-again.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: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Subject: mm/swap.c: make functions and their kernel-doc agree (again)
There was a conflict between the commit e02a9f048ef7 ("mm/swap.c: make
functions and their kernel-doc agree") and the commit f144c390f905 ("mm:
docs: fix parameter names mismatch") that both tried to fix mismatch
betweeen pagevec_lookup_entries() parameter names and their description.
Since nr_entries is a better name for the parameter, fix the description
again.
Link: http://lkml.kernel.org/r/1518116946-20947-1-git-send-email-rppt@xxxxxxxxxxxxxxxxxx
Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/swap.c~mm-swapc-make-functions-and-their-kernel-doc-agree-again mm/swap.c
--- a/mm/swap.c~mm-swapc-make-functions-and-their-kernel-doc-agree-again
+++ a/mm/swap.c
@@ -925,7 +925,7 @@ EXPORT_SYMBOL(__pagevec_lru_add);
* @pvec: Where the resulting entries are placed
* @mapping: The address_space to search
* @start: The starting entry index
- * @nr_pages: The maximum number of pages
+ * @nr_entries: The maximum number of pages
* @indices: The cache indices corresponding to the entries in @pvec
*
* pagevec_lookup_entries() will search for and return a group of up
_
Patches currently in -mm which might be from rppt@xxxxxxxxxxxxxxxxxx are
mm-zpool-zpool_evictable-fix-mismatch-in-parameter-name-and-kernel-doc.patch
mm-swapc-make-functions-and-their-kernel-doc-agree-again.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
