Merge 'akpm' patch series

* Merge akpm patch series: (122 commits)
  drivers/connector/cn_proc.c: remove unused local
  Documentation/SubmitChecklist: add RCU debug config options
  reiserfs: use hweight_long()
  reiserfs: use proper little-endian bitops
  pnpacpi: register disabled resources
  drivers/rtc/rtc-tegra.c: properly initialize spinlock
  drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()
  drivers/rtc: add support for Qualcomm PMIC8xxx RTC
  drivers/rtc/rtc-s3c.c: support clock gating
  drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200
  init: skip calibration delay if previously done
  misc/eeprom: add eeprom access driver for digsy_mtc board
  misc/eeprom: add driver for microwire 93xx46 EEPROMs
  checkpatch.pl: update $logFunctions
  checkpatch: make utf-8 test --strict
  checkpatch.pl: add ability to ignore various messages
  checkpatch: add a "prefer __aligned" check
  checkpatch: validate signature styles and To: and Cc: lines
  checkpatch: add __rcu as a sparse modifier
  checkpatch: suggest using min_t or max_t
  ...

Did this as a merge because of (trivial) conflicts in
 - Documentation/feature-removal-schedule.txt
 - arch/xtensa/include/asm/uaccess.h
that were just easier to fix up in the merge than in the patch series.

2 files changed, 513 insertions, 152 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b0aa2c680593..9d761c95eca2 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -10,7 +10,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.31';
+my $V = '0.32';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -26,9 +26,13 @@ my $check = 0;
 my $summary = 1;
 my $mailback = 0;
 my $summary_file = 0;
+my $show_types = 0;
 my $root;
 my %debug;
+my %ignore_type = ();
+my @ignore = ();
 my $help = 0;
+my $configuration_file = ".checkpatch.conf";
 
 sub help {
         my ($exitcode) = @_;
@@ -46,6 +50,8 @@ Options:
   --terse                    one line per report
   -f, --file                 treat FILE as regular source file
   --subjective, --strict     enable more subjective tests
+  --ignore TYPE(,TYPE2...)   ignore various comma separated message types
+  --show-types               show the message "types" in the output
   --root=PATH                PATH to the kernel tree root
   --no-summary               suppress the per-file summary
   --mailback                 only produce a report in case of warnings/errors
@@ -63,6 +69,32 @@ EOM
         exit($exitcode);
 }
 
+my $conf = which_conf($configuration_file);
+if (-f $conf) {
+        my @conf_args;
+        open(my $conffile, '<', "$conf")
+            or warn "$P: Can't find a readable $configuration_file file $!\n";
+
+        while (<$conffile>) {
+                my $line = $_;
+
+                $line =~ s/\s*\n?$//g;
+                $line =~ s/^\s*//g;
+                $line =~ s/\s+/ /g;
+
+                next if ($line =~ m/^\s*#/);
+                next if ($line =~ m/^\s*$/);
+
+                my @words = split(" ", $line);
+                foreach my $word (@words) {
+                        last if ($word =~ m/^#/);
+                        push (@conf_args, $word);
+                }
+        }
+        close($conffile);
+        unshift(@ARGV, @conf_args) if @conf_args;
+}
+
 GetOptions(
         'q|quiet+'      => \$quiet,
         'tree!'         => \$tree,
@@ -73,6 +105,8 @@ GetOptions(
         'f|file!'       => \$file,
         'subjective!'   => \$check,
         'strict!'       => \$check,
+        'ignore=s'      => \@ignore,
+        'show-types!'   => \$show_types,
         'root=s'        => \$root,
         'summary!'      => \$summary,
         'mailback!'     => \$mailback,
@@ -93,6 +127,19 @@ if ($#ARGV < 0) {
         exit(1);
 }
 
+@ignore = split(/,/, join(',',@ignore));
+foreach my $word (@ignore) {
+        $word =~ s/\s*\n?$//g;
+        $word =~ s/^\s*//g;
+        $word =~ s/\s+/ /g;
+        $word =~ tr/[a-z]/[A-Z]/;
+
+        next if ($word =~ m/^\s*#/);
+        next if ($word =~ m/^\s*$/);
+
+        $ignore_type{$word}++;
+}
+
 my $dbg_values = 0;
 my $dbg_possible = 0;
 my $dbg_type = 0;
@@ -145,7 +192,8 @@ our $Sparse	= qr{
                         __must_check|
                         __init_refok|
                         __kprobes|
-                        __ref
+                        __ref|
+                        __rcu
                 }x;
 
 # Notes to $Attribute:
@@ -209,13 +257,23 @@ our $typeTypedefs = qr{(?x:
 )};
 
 our $logFunctions = qr{(?x:
-        printk|
-        [a-z]+_(emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)|
-        WARN|
+        printk(?:_ratelimited|_once|)|
+        [a-z0-9]+_(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
+        WARN(?:_RATELIMIT|_ONCE|)|
         panic|
         MODULE_[A-Z_]+
 )};
 
+our $signature_tags = qr{(?xi:
+        Signed-off-by:|
+        Acked-by:|
+        Tested-by:|
+        Reviewed-by:|
+        Reported-by:|
+        To:|
+        Cc:
+)};
+
 our @typeList = (
         qr{void},
         qr{(?:unsigned\s+)?char},
@@ -268,6 +326,20 @@ sub build_types {
 }
 build_types();
 
+our $match_balanced_parentheses = qr/(\((?:[^\(\)]+|(-1))*\))/;
+
+our $Typecast   = qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
+our $LvalOrFunc = qr{($Lval)\s*($match_balanced_parentheses{0,1})\s*};
+
+sub deparenthesize {
+        my ($string) = @_;
+        return "" if (!defined($string));
+        $string =~ s@^\s*\(\s*@@g;
+        $string =~ s@\s*\)\s*$@@g;
+        $string =~ s@\s+@ @g;
+        return $string;
+}
+
 $chk_signoff = 0 if ($file);
 
 my @dep_includes = ();
@@ -339,6 +411,88 @@ sub top_of_kernel_tree {
                 }
         }
         return 1;
+    }
+
+sub parse_email {
+        my ($formatted_email) = @_;
+
+        my $name = "";
+        my $address = "";
+        my $comment = "";
+
+        if ($formatted_email =~ /^(.*)<(\S+\@\S+)>(.*)$/) {
+                $name = $1;
+                $address = $2;
+                $comment = $3 if defined $3;
+        } elsif ($formatted_email =~ /^\s*<(\S+\@\S+)>(.*)$/) {
+                $address = $1;
+                $comment = $2 if defined $2;