From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Oct 2012 01:32:29 +0000 (+0900)
Subject: Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cbd8aca472134e666eee87462177f1be854ebbf8;p=~shefty%2Frdma-dev.git

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild misc changes from Michal Marek:
 "In the non-critical part of kbuild, I have
   - Some make coccicheck improvements and two new tests
   - Support for a cleaner html output in scripts/kernel-doc, named
     html5 (no, it does not play videos, yet)

  BTW, Randy wants to route further kernel-doc patches through the
  kbuild tree."

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Update SmPL/Coccinelle section of MAINTAINERS
  coccicheck: Add the rep+ctxt mode
  scripts/coccinelle/tests/odd_ptr_err.cocci: semantic patch for IS_ERR/PTR_ERR inconsistency
  scripts/tags.sh: Add magic for pci access functions
  scripts/coccinelle: ptr_ret: Add ternary operator version
  scripts/kernel-doc: drop maintainer
  scripts/kernel-doc: added support for html5
---

cbd8aca472134e666eee87462177f1be854ebbf8
diff --cc scripts/kernel-doc
index 01e8a8e2260,97e037aa97a..46e7aff80d1
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@@ -460,14 -479,14 +481,19 @@@ sub output_highlight 
      die $@ if $@;
  #   print STDERR "contents af:$contents\n";
  
+ #   strip whitespaces when generating html5
+     if ($output_mode eq "html5") {
+ 	$contents =~ s/^\s+//;
+ 	$contents =~ s/\s+$//;
+     }
      foreach $line (split "\n", $contents) {
 +	if (! $output_preformatted) {
 +	    $line =~ s/^\s*//;
 +	}
  	if ($line eq ""){
 -	    print $lineprefix, local_unescape($blankline);
 +	    if (! $output_preformatted) {
 +		print $lineprefix, local_unescape($blankline);
 +	    }
  	} else {
  	    $line =~ s/\\\\\\/\&/g;
  	    if ($output_mode eq "man" && substr($line, 0, 1) eq ".") {