Merge branch 'akpm' (incoming from Andrew)

Merge second batch of fixes from Andrew Morton:

 - various misc bits

 - some printk updates

 - a new "SRAM" driver.

 - MAINTAINERS updates

 - the backlight driver queue

 - checkpatch updates

 - a few init/ changes

 - a huge number of drivers/rtc changes

 - fatfs updates

 - some lib/idr.c work

 - some renaming of the random driver interfaces

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (285 commits)
  net: rename random32 to prandom
  net/core: remove duplicate statements by do-while loop
  net/core: rename random32() to prandom_u32()
  net/netfilter: rename random32() to prandom_u32()
  net/sched: rename random32() to prandom_u32()
  net/sunrpc: rename random32() to prandom_u32()
  scsi: rename random32() to prandom_u32()
  lguest: rename random32() to prandom_u32()
  uwb: rename random32() to prandom_u32()
  video/uvesafb: rename random32() to prandom_u32()
  mmc: rename random32() to prandom_u32()
  drbd: rename random32() to prandom_u32()
  kernel/: rename random32() to prandom_u32()
  mm/: rename random32() to prandom_u32()
  lib/: rename random32() to prandom_u32()
  x86: rename random32() to prandom_u32()
  x86: pageattr-test: remove srandom32 call
  uuid: use prandom_bytes()
  raid6test: use prandom_bytes()
  sctp: convert sctp_assoc_set_id() to use idr_alloc_cyclic()
  ...

2 files changed, 30 insertions, 5 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4de4bc48493b..b954de58304f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -281,6 +281,7 @@ our $signature_tags = qr{(?xi:
         Tested-by:|
         Reviewed-by:|
         Reported-by:|
+        Suggested-by:|
         To:|
         Cc:
 )};
@@ -628,6 +629,13 @@ sub sanitise_line {
         return $res;
 }
 
+sub get_quoted_string {
+        my ($line, $rawline) = @_;
+
+        return "" if ($line !~ m/(\"[X]+\")/g);
+        return substr($rawline, $-[0], $+[0] - $-[0]);
+}
+
 sub ctx_statement_block {
         my ($linenr, $remain, $off) = @_;
         my $line = $linenr - 1;
@@ -1576,7 +1584,8 @@ sub process {
 # Check for incorrect file permissions
                 if ($line =~ /^new (file )?mode.*[7531]\d{0,2}$/) {
                         my $permhere = $here . "FILE: $realfile\n";
-                        if ($realfile =~ /(Makefile|Kconfig|\.c|\.h|\.S|\.tmpl)$/) {
+                        if ($realfile !~ m@scripts/@ &&
+                            $realfile !~ /\.(py|pl|awk|sh)$/) {
                                 ERROR("EXECUTE_PERMISSIONS",
                                       "do not set execute permissions for source files\n" . $permhere);
                         }
@@ -2514,8 +2523,8 @@ sub process {
 
 # check for whitespace before a non-naked semicolon
                 if ($line =~ /^\+.*\S\s+;/) {
-                        CHK("SPACING",
-                            "space prohibited before semicolon\n" . $herecurr);
+                        WARN("SPACING",
+                             "space prohibited before semicolon\n" . $herecurr);
                 }
 
 # Check operator spacing.
@@ -3221,7 +3230,7 @@ sub process {
                 }
 
 # check for unnecessary blank lines around braces
-                if (($line =~ /^..*}\s*$/ && $prevline =~ /^.\s*$/)) {
+                if (($line =~ /^.\s*}\s*$/ && $prevline =~ /^.\s*$/)) {
                         CHK("BRACES",
                             "Blank lines aren't necessary before a close brace '}'\n" . $hereprev);
                 }
@@ -3373,6 +3382,15 @@ sub process {
                              "struct spinlock should be spinlock_t\n" . $herecurr);
                 }
 
+# check for seq_printf uses that could be seq_puts
+                if ($line =~ /\bseq_printf\s*\(/) {
+                        my $fmt = get_quoted_string($line, $rawline);
+                        if ($fmt !~ /[^\\]\%/) {
+                                WARN("PREFER_SEQ_PUTS",
+                                     "Prefer seq_puts to seq_printf\n" . $herecurr);
+                        }
+                }
+
 # Check for misused memsets
                 if ($^V && $^V ge 5.10.0 &&
                     defined $stat &&
@@ -3477,6 +3495,13 @@ sub process {
                              "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr);
                 }
 
+# check for krealloc arg reuse
+                if ($^V && $^V ge 5.10.0 &&
+                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*\1\s*,/) {
+                        WARN("KREALLOC_ARG_REUSE",
+                             "Reusing the krealloc arg is almost always a bug\n" . $herecurr);
+                }
+
 # check for alloc argument mismatch
                 if ($line =~ /\b(kcalloc|kmalloc_array)\s*\(\s*sizeof\b/) {
                         WARN("ALLOC_ARRAY_ARGS",
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index ce4cc837b748..5e4fb144a04f 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -611,7 +611,7 @@ sub get_maintainers {
                                     $hash{$tvi} = $value_pd;
                                 }
                             }
-                        } elsif ($type eq 'K') {
+                        } elsif ($type eq 'N') {
                             if ($file =~ m/$value/x) {
                                 $hash{$tvi} = 0;
                             }