Received: by 10.223.176.5 with SMTP id f5csp2281075wra; Thu, 8 Feb 2018 11:18:03 -0800 (PST) X-Google-Smtp-Source: AH8x224Dgf6TOjcsnzmtS5O6STTmY7r6zTP1OVdAtMzcyYRU8Lmqf/wTBrosl7ITRkkrTwIwUTMH X-Received: by 10.98.159.200 with SMTP id v69mr109404pfk.236.1518117483518; Thu, 08 Feb 2018 11:18:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518117483; cv=none; d=google.com; s=arc-20160816; b=onhs1ey8kyKo7FRdYcGFDoYFokCyCZT7ugPTQNkppJwPdUOWT2QvcFh25AV3Hz0sxR hVAlIcfFCbIKtC0EQQqUtvZZZ3rGWqW7A612v1jGByf3Lr1YaXL46eV+s9kLx2MGOLoH tXOR39vxSEOnSt9nkergS7v8Xj83RDxomsB57Fl0QPyWUX2mnAAnny/PlHBDe3en+D3b Wi4M3PUxzQS7bwGFpC1X1ysSzxT08wKH0e6qJmRZpTIuz0UY3XNSnjYu4YjjFKfT8O5t eBphIUMT/vZ1Ht7QW8OtYKyurd8nXJ1OtKwD7YVfMpX/SU+2x6ckLqYKUOysuHalCKMi Ql/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature :arc-authentication-results; bh=UM8fnrGwwP/DqDFCgI64Opsz1DYTjtFx76LzjrQrmkg=; b=NJ9mFMMHe0lp7E+GYqb+kkXPDzGQB4rOq5IdVazYijhXlJaljB4ChnGBVAZVnfmO5k 1L9jzzIIadYLJ6zPfCPZ+2obyYcL2PVaLJaHN7mpwJoDBdU0cXUqC0GFYphy09rpV032 G7n4ToXsxT7jfCw923OZyABPld5q3Dxnm44GIxRdkX9Es4OsveiWQeH0MILOfIx9gOSs NuQxfAtSDxFWQ1tH12MzB4phI/cA9EpMviX0+a1O4obknFgwl+Izf7t8R69HKbavyTC4 /b95CTjRKUlQc3ZrLjp1FE69+cJASbVbFzYAhm5iyfJ7FHd2HmWdsig8tVBHR+7VC0FG xGPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=merlin.20170209 header.b=SF1wdlxb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k12si298996pgc.587.2018.02.08.11.17.47; Thu, 08 Feb 2018 11:18:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=merlin.20170209 header.b=SF1wdlxb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752203AbeBHTQd (ORCPT + 99 others); Thu, 8 Feb 2018 14:16:33 -0500 Received: from merlin.infradead.org ([205.233.59.134]:49114 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751544AbeBHTQc (ORCPT ); Thu, 8 Feb 2018 14:16:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To:Subject:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UM8fnrGwwP/DqDFCgI64Opsz1DYTjtFx76LzjrQrmkg=; b=SF1wdlxb3YW96uM3k2vYzBPXl6 gpfQdpNyYLo0WEZ4k7tPlfJuOw1CHI4I7FreecAuQjruzBJNZ6A33vslLsMyyGeBuwHME6p5APveR Yz1iStcpR3LejVZ2TU3zPVG+8v7E0A2bZjP5tDuW/OZe1JLROYpxuQLqh7nQmmPe7/1B5PqY3gZ/v 0z5SKml/b1xVBt1ZZSwjY4hTW6l4gr8CpvWAyADq/UVkXCXznJYqNYBrDJervx9G9K9O3A9RrS6Td IGf11qQj7xfFzihECNXIZ3t3SM5TfaOg/f47URvNgethuzlBxkAdzh3Nt1i3/kOkEO8c6KX53jTFn DWflro+Q==; Received: from static-50-53-52-16.bvtn.or.frontiernet.net ([50.53.52.16] helo=dragon.site) by merlin.infradead.org with esmtpsa (Exim 4.89 #1 (Red Hat Linux)) id 1ejrgM-0003mN-Pn; Thu, 08 Feb 2018 19:16:30 +0000 Subject: Re: [PATCH] mm/swap.c: make functions and their kernel-doc agree (again) To: Mike Rapoport , Andrew Morton Cc: linux-mm , lkml , Matthew Wilcox References: <1518116946-20947-1-git-send-email-rppt@linux.vnet.ibm.com> From: Randy Dunlap Message-ID: <931229b3-cf82-0999-ac85-c19578a6ee2a@infradead.org> Date: Thu, 8 Feb 2018 11:16:29 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <1518116946-20947-1-git-send-email-rppt@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/08/2018 11:09 AM, Mike Rapoport wrote: > 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. > > Signed-off-by: Mike Rapoport Thanks, I hadn't noticed. Acked-by: Randy Dunlap > --- > mm/swap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/swap.c b/mm/swap.c > index 567a7b96e41d..6d7b8bc58003 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -913,7 +913,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 > -- ~Randy