From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - kernel-doc-allow-a-little-whitespace.patch removed from -mm tree Date: Sun, 11 Feb 2007 14:53:31 -0800 Message-ID: <200702112253.l1BMrVZl016104@shell0.pdx.osdl.net> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp.osdl.org ([65.172.181.24]:60369 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932818AbXBKWxf (ORCPT ); Sun, 11 Feb 2007 17:53:35 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: randy.dunlap@oracle.com, mm-commits@vger.kernel.org The patch titled kernel-doc: allow a little whitespace has been removed from the -mm tree. Its filename was kernel-doc-allow-a-little-whitespace.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: kernel-doc: allow a little whitespace From: Randy Dunlap In kernel-doc syntax, be a little flexible: allow whitespace between a function parameter name and the colon that must follow it, such as: @pdev : PCI device to unplug (This allows lots of megaraid kernel-doc to work without tons of editing.) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton --- Documentation/kernel-doc-nano-HOWTO.txt | 2 +- scripts/kernel-doc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN Documentation/kernel-doc-nano-HOWTO.txt~kernel-doc-allow-a-little-whitespace Documentation/kernel-doc-nano-HOWTO.txt --- a/Documentation/kernel-doc-nano-HOWTO.txt~kernel-doc-allow-a-little-whitespace +++ a/Documentation/kernel-doc-nano-HOWTO.txt @@ -101,7 +101,7 @@ The format of the block comment is like /** * function_name(:)? (- short description)? -(* @parameterx: (description of parameter x)?)* +(* @parameterx(space)*: (description of parameter x)?)* (* a blank line)? * (Description:)? (Description of function)? * (section header: (section description)? )* diff -puN scripts/kernel-doc~kernel-doc-allow-a-little-whitespace scripts/kernel-doc --- a/scripts/kernel-doc~kernel-doc-allow-a-little-whitespace +++ a/scripts/kernel-doc @@ -83,7 +83,7 @@ use strict; # * my_function # **/ # -# If the Description: header tag is ommitted, then there must be a blank line +# If the Description: header tag is omitted, then there must be a blank line # after the last parameter specification. # e.g. # /** @@ -265,7 +265,7 @@ my $doc_start = '^/\*\*\s*$'; # Allow wh my $doc_end = '\*/'; my $doc_com = '\s*\*\s*'; my $doc_decl = $doc_com.'(\w+)'; -my $doc_sect = $doc_com.'(['.$doc_special.']?[\w ]+):(.*)'; +my $doc_sect = $doc_com.'(['.$doc_special.']?[\w\s]+):(.*)'; my $doc_content = $doc_com.'(.*)'; my $doc_block = $doc_com.'DOC:\s*(.*)?'; _ Patches currently in -mm which might be from randy.dunlap@oracle.com are origin.patch git-drm.patch qconf-immediately-update-integer-and-string-values-in-xconfig-display-take-2.patch git-mtd.patch git-netdev-all.patch phy-layer-add-kernel-doc-docbook.patch parisc-fix-module_param-iommu-permission.patch ueagle-atmc-needs-schedh.patch com20020-build-fix.patch drivers-telephony-ixj-convert-to-generic-boolean.patch extend-notifier_call_chain-to-count-nr_calls-made-fixes.patch reiser4-use-null-for-pointers.patch profile_likely-export-do_check_likely.patch