3 files changed, 22 insertions, 1 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index faea0ec612bf..e5bd60ff48e3 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2382,6 +2382,19 @@ sub process {
                         }
                 }
 
+                if ($line =~ /\bprintk\s*\(\s*KERN_([A-Z]+)/) {
+                        my $orig = $1;
+                        my $level = lc($orig);
+                        $level = "warn" if ($level eq "warning");
+                        WARN("PREFER_PR_LEVEL",
+                             "Prefer pr_$level(... to printk(KERN_$1, ...\n" . $herecurr);
+                }
+
+                if ($line =~ /\bpr_warning\s*\(/) {
+                        WARN("PREFER_PR_LEVEL",
+                             "Prefer pr_warn(... to pr_warning(...\n" . $herecurr);
+                }
+
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
                 if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
@@ -2448,6 +2461,13 @@ sub process {
                                      "space prohibited between function name and open parenthesis '('\n" . $herecurr);
                         }
                 }
+
+# check for whitespace before a non-naked semicolon
+                if ($line =~ /^\+.*\S\s+;/) {
+                        CHK("SPACING",
+                            "space prohibited before semicolon\n" . $herecurr);
+                }
+
 # Check operator spacing.
                 if (!($line=~/\#\s*include/)) {
                         my $ops = qr{
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 0948c6b5a321..8b673dd4627f 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -83,6 +83,8 @@ push(@signature_tags, "Signed-off-by:");
 push(@signature_tags, "Reviewed-by:");
 push(@signature_tags, "Acked-by:");
 
+my $signature_pattern = "\(" . join("|", @signature_tags) . "\)";
+
 # rfc822 email address - preloaded methods go here.
 my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])";
 my $rfc822_char = '[\\000-\\377]';
@@ -473,7 +475,6 @@ my @subsystem = ();
 my @status = ();
 my %deduplicate_name_hash = ();
 my %deduplicate_address_hash = ();
-my $signature_pattern;
 
 my @maintainers = get_maintainers();
 
diff --git a/scripts/gfp-translate b/scripts/gfp-translate
index c9230e158a8f..c9230e158a8f 100644..100755
--- a/scripts/gfp-translate
+++ b/scripts/gfp-translate