3 files changed, 52 insertions, 10 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 6a3ee981931d..afa44595f348 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -209,7 +209,7 @@ endif
 # >$< substitution to preserve $ when reloading .cmd file
 # note: when using inline perl scripts [perl -e '...$$t=1;...']
 # in $(cmd_xxx) double $$ your perl vars
-make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1)))))
+make-cmd = $(subst \\,\\\\,$(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1))))))
 
 # Find any prerequisites that is newer than target or that does not exist.
 # PHONY targets skipped in both cases.
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ca05ba217f5f..21a9f5de0a21 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -421,7 +421,7 @@ sub top_of_kernel_tree {
                 }
         }
         return 1;
-    }
+}
 
 sub parse_email {
         my ($formatted_email) = @_;
@@ -1386,6 +1386,8 @@ sub process {
         my $in_header_lines = 1;
         my $in_commit_log = 0;          #Scanning lines before patch
 
+        my $non_utf8_charset = 0;
+
         our @report = ();
         our $cnt_lines = 0;
         our $cnt_error = 0;
@@ -1686,10 +1688,17 @@ sub process {
                         $in_commit_log = 1;
                 }
 
-# Still not yet in a patch, check for any UTF-8
-                if ($in_commit_log && $realfile =~ /^$/ &&
+# Check if there is UTF-8 in a commit log when a mail header has explicitly
+# declined it, i.e defined some charset where it is missing.
+                if ($in_header_lines &&
+                    $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
+                    $1 !~ /utf-8/i) {
+                        $non_utf8_charset = 1;
+                }
+
+                if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
                     $rawline =~ /$NON_ASCII_UTF8/) {
-                        CHK("UTF8_BEFORE_PATCH",
+                        WARN("UTF8_BEFORE_PATCH",
                             "8-bit UTF-8 used in possible commit log\n" . $herecurr);
                 }
 
@@ -1873,6 +1882,20 @@ sub process {
                             "No space is necessary after a cast\n" . $hereprev);
                 }
 
+                if ($realfile =~ m@^(drivers/net/|net/)@ &&
+                    $rawline =~ /^\+[ \t]*\/\*[ \t]*$/ &&
+                    $prevrawline =~ /^\+[ \t]*$/) {
+                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+                             "networking block comments don't use an empty /* line, use /* Comment...\n" . $hereprev);
+                }
+
+                if ($realfile =~ m@^(drivers/net/|net/)@ &&
+                    $rawline !~ m@^\+[ \t]*(\/\*|\*\/)@ &&
+                    $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) {
+                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+                             "networking block comments put the trailing */ on a separate line\n" . $herecurr);
+                }
+
 # check for spaces at the beginning of a line.
 # Exceptions:
 #  1) within comments
@@ -2390,8 +2413,10 @@ sub process {
                         my $orig = $1;
                         my $level = lc($orig);
                         $level = "warn" if ($level eq "warning");
+                        my $level2 = $level;
+                        $level2 = "dbg" if ($level eq "debug");
                         WARN("PREFER_PR_LEVEL",
-                             "Prefer pr_$level(... to printk(KERN_$1, ...\n" . $herecurr);
+                             "Prefer netdev_$level2(netdev, ... then dev_$level2(dev, ... then pr_$level(...  to printk(KERN_$orig ...\n" . $herecurr);
                 }
 
                 if ($line =~ /\bpr_warning\s*\(/) {
@@ -2947,7 +2972,7 @@ sub process {
                         my $exceptions = qr{
                                 $Declare|
                                 module_param_named|
-                                MODULE_PARAM_DESC|
+                                MODULE_PARM_DESC|
                                 DECLARE_PER_CPU|
                                 DEFINE_PER_CPU|
                                 __typeof__\(|
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 8fd107a3fac4..01e8a8e22602 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -230,6 +230,7 @@ my $dohighlight = "";
 
 my $verbose = 0;
 my $output_mode = "man";
+my $output_preformatted = 0;
 my $no_doc_sections = 0;
 my %highlights = %highlights_man;
 my $blankline = $blankline_man;
@@ -280,9 +281,10 @@ my $doc_special = "\@\%\$\&";
 my $doc_start = '^/\*\*\s*$'; # Allow whitespace at end of comment start.
 my $doc_end = '\*/';
 my $doc_com = '\s*\*\s*';
+my $doc_com_body = '\s*\* ?';
 my $doc_decl = $doc_com . '(\w+)';
 my $doc_sect = $doc_com . '([' . $doc_special . ']?[\w\s]+):(.*)';
-my $doc_content = $doc_com . '(.*)';
+my $doc_content = $doc_com_body . '(.*)';
 my $doc_block = $doc_com . 'DOC:\s*(.*)?';
 
 my %constants;
@@ -459,8 +461,13 @@ sub output_highlight {
 #   print STDERR "contents af:$contents\n";
 
     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 ".") {
@@ -643,10 +650,12 @@ sub output_section_xml(%) {
         print "<title>$section</title>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "<informalexample><programlisting>\n";
+            $output_preformatted = 1;
         } else {
             print "<para>\n";
         }
         output_highlight($args{'sections'}{$section});
+        $output_preformatted = 0;
         if ($section =~ m/EXAMPLE/i) {
             print "</programlisting></informalexample>\n";
         } else {
@@ -949,10 +958,12 @@ sub output_blockhead_xml(%) {
         }
         if ($section =~ m/EXAMPLE/i) {
             print "<example><para>\n";
+            $output_preformatted = 1;
         } else {
             print "<para>\n";
         }
         output_highlight($args{'sections'}{$section});
+        $output_preformatted = 0;
         if ($section =~ m/EXAMPLE/i) {
             print "</para></example>\n";
         } else {
@@ -1028,10 +1039,12 @@ sub output_function_gnome {
         print "<simplesect>\n <title>$section</title>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "<example><programlisting>\n";
+            $output_preformatted = 1;
         } else {
         }
         print "<para>\n";
         output_highlight($args{'sections'}{$section});
+        $output_preformatted = 0;
         print "</para>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "</programlisting></example>\n";
@@ -2046,6 +2059,9 @@ sub process_file($) {
 
     $section_counter = 0;
     while (<IN>) {
+        while (s/\\\s*$//) {
+            $_ .= <IN>;
+        }
         if ($state == 0) {
             if (/$doc_start/o) {
                 $state = 1;             # next line is always the function name
@@ -2073,7 +2089,7 @@ sub process_file($) {
                     $descr= $1;
                     $descr =~ s/^\s*//;
                     $descr =~ s/\s*$//;
-                    $descr =~ s/\s+/ /;
+                    $descr =~ s/\s+/ /g;
                     $declaration_purpose = xml_escape($descr);
                     $in_purpose = 1;
                 } else {
@@ -2165,6 +2181,7 @@ sub process_file($) {
                     # Continued declaration purpose
                     chomp($declaration_purpose);
                     $declaration_purpose .= " " . xml_escape($1);
+                    $declaration_purpose =~ s/\s+/ /g;
                 } else {
                     $contents .= $1 . "\n";
                 }