Merge branch 'akpm' (patchbomb from Andrew Morton)

Merge incoming from Andrew Morton:
 - Various misc things.
 - arch/sh updates.
 - Part of ocfs2.  Review is slow.
 - Slab updates.
 - Most of -mm.
 - printk updates.
 - lib/ updates.
 - checkpatch updates.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (226 commits)
  checkpatch: update $declaration_macros, add uninitialized_var
  checkpatch: warn on missing spaces in broken up quoted
  checkpatch: fix false positives for --strict "space after cast" test
  checkpatch: fix false positive MISSING_BREAK warnings with --file
  checkpatch: add test for native c90 types in unusual order
  checkpatch: add signed generic types
  checkpatch: add short int to c variable types
  checkpatch: add for_each tests to indentation and brace tests
  checkpatch: fix brace style misuses of else and while
  checkpatch: add --fix option for a couple OPEN_BRACE misuses
  checkpatch: use the correct indentation for which()
  checkpatch: add fix_insert_line and fix_delete_line helpers
  checkpatch: add ability to insert and delete lines to patch/file
  checkpatch: add an index variable for fixed lines
  checkpatch: warn on break after goto or return with same tab indentation
  checkpatch: emit a warning on file add/move/delete
  checkpatch: add test for commit id formatting style in commit log
  checkpatch: emit fewer kmalloc_array/kcalloc conversion warnings
  checkpatch: improve "no space after cast" test
  checkpatch: allow multiple const * types
  ...

1 files changed, 470 insertions, 111 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 182be0f12407..31a731e06f50 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -309,9 +309,12 @@ our $Operators	= qr{
 our $c90_Keywords = qr{do|for|while|if|else|return|goto|continue|switch|default|case|break}x;
 
 our $NonptrType;
+our $NonptrTypeMisordered;
 our $NonptrTypeWithAttr;
 our $Type;
+our $TypeMisordered;
 our $Declare;
+our $DeclareMisordered;
 
 our $NON_ASCII_UTF8     = qr{
         [\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
@@ -353,16 +356,36 @@ our $signature_tags = qr{(?xi:
         Cc:
 )};
 
+our @typeListMisordered = (
+        qr{char\s+(?:un)?signed},
+        qr{int\s+(?:(?:un)?signed\s+)?short\s},
+        qr{int\s+short(?:\s+(?:un)?signed)},
+        qr{short\s+int(?:\s+(?:un)?signed)},
+        qr{(?:un)?signed\s+int\s+short},
+        qr{short\s+(?:un)?signed},
+        qr{long\s+int\s+(?:un)?signed},
+        qr{int\s+long\s+(?:un)?signed},
+        qr{long\s+(?:un)?signed\s+int},
+        qr{int\s+(?:un)?signed\s+long},
+        qr{int\s+(?:un)?signed},
+        qr{int\s+long\s+long\s+(?:un)?signed},
+        qr{long\s+long\s+int\s+(?:un)?signed},
+        qr{long\s+long\s+(?:un)?signed\s+int},
+        qr{long\s+long\s+(?:un)?signed},
+        qr{long\s+(?:un)?signed},
+);
+
 our @typeList = (
         qr{void},
-        qr{(?:unsigned\s+)?char},
-        qr{(?:unsigned\s+)?short},
-        qr{(?:unsigned\s+)?int},
-        qr{(?:unsigned\s+)?long},
-        qr{(?:unsigned\s+)?long\s+int},
-        qr{(?:unsigned\s+)?long\s+long},
-        qr{(?:unsigned\s+)?long\s+long\s+int},
-        qr{unsigned},
+        qr{(?:(?:un)?signed\s+)?char},
+        qr{(?:(?:un)?signed\s+)?short\s+int},
+        qr{(?:(?:un)?signed\s+)?short},
+        qr{(?:(?:un)?signed\s+)?int},
+        qr{(?:(?:un)?signed\s+)?long\s+int},
+        qr{(?:(?:un)?signed\s+)?long\s+long\s+int},
+        qr{(?:(?:un)?signed\s+)?long\s+long},
+        qr{(?:(?:un)?signed\s+)?long},
+        qr{(?:un)?signed},
         qr{float},
         qr{double},
         qr{bool},
@@ -372,6 +395,7 @@ our @typeList = (
         qr{${Ident}_t},
         qr{${Ident}_handler},
         qr{${Ident}_handler_fn},
+        @typeListMisordered,
 );
 our @typeListWithAttr = (
         @typeList,
@@ -399,11 +423,6 @@ foreach my $entry (@mode_permission_funcs) {
         $mode_perms_search .= $entry->[0];
 }
 
-our $declaration_macros = qr{(?x:
-        (?:$Storage\s+)?(?:DECLARE|DEFINE)_[A-Z]+\s*\(|
-        (?:$Storage\s+)?LIST_HEAD\s*\(
-)};
-
 our $allowed_asm_includes = qr{(?x:
         irq|
         memory
@@ -413,6 +432,7 @@ our $allowed_asm_includes = qr{(?x:
 sub build_types {
         my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
         my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
+        my $Misordered = "(?x:  \n" . join("|\n  ", @typeListMisordered) . "\n)";
         my $allWithAttr = "(?x:  \n" . join("|\n  ", @typeListWithAttr) . "\n)";
         $Modifier       = qr{(?:$Attribute|$Sparse|$mods)};
         $NonptrType     = qr{
@@ -424,6 +444,13 @@ sub build_types {
                         )
                         (?:\s+$Modifier|\s+const)*
                   }x;
+        $NonptrTypeMisordered   = qr{
+                        (?:$Modifier\s+|const\s+)*
+                        (?:
+                                (?:${Misordered}\b)
+                        )
+                        (?:\s+$Modifier|\s+const)*
+                  }x;
         $NonptrTypeWithAttr     = qr{
                         (?:$Modifier\s+|const\s+)*
                         (?:
@@ -435,10 +462,16 @@ sub build_types {
                   }x;
         $Type   = qr{
                         $NonptrType
-                        (?:(?:\s|\*|\[\])+\s*const|(?:\s|\*|\[\])+|(?:\s*\[\s*\])+)?
+                        (?:(?:\s|\*|\[\])+\s*const|(?:\s|\*\s*(?:const\s*)?|\[\])+|(?:\s*\[\s*\])+)?
+                        (?:\s+$Inline|\s+$Modifier)*
+                  }x;
+        $TypeMisordered = qr{
+                        $NonptrTypeMisordered
+                        (?:(?:\s|\*|\[\])+\s*const|(?:\s|\*\s*(?:const\s*)?|\[\])+|(?:\s*\[\s*\])+)?
                         (?:\s+$Inline|\s+$Modifier)*
                   }x;
         $Declare        = qr{(?:$Storage\s+(?:$Inline\s+)?)?$Type};
+        $DeclareMisordered      = qr{(?:$Storage\s+(?:$Inline\s+)?)?$TypeMisordered};
 }
 build_types();
 
@@ -452,6 +485,12 @@ our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
 our $LvalOrFunc = qr{((?:[\&\*]\s*)?$Lval)\s*($balanced_parens{0,1})\s*};
 our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)};
 
+our $declaration_macros = qr{(?x:
+        (?:$Storage\s+)?(?:[A-Z_][A-Z0-9]*_){0,2}(?:DEFINE|DECLARE)(?:_[A-Z0-9]+){1,2}\s*\(|
+        (?:$Storage\s+)?LIST_HEAD\s*\(|
+        (?:$Storage\s+)?${Type}\s+uninitialized_var\s*\(
+)};
+
 sub deparenthesize {
         my ($string) = @_;
         return "" if (!defined($string));
@@ -550,11 +589,43 @@ sub seed_camelcase_includes {
         }
 }
 
+sub git_commit_info {
+        my ($commit, $id, $desc) = @_;
+
+        return ($id, $desc) if ((which("git") eq "") || !(-e ".git"));
+
+        my $output = `git log --no-color --format='%H %s' -1 $commit 2>&1`;
+        $output =~ s/^\s*//gm;
+        my @lines = split("\n", $output);
+
+        if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous\./) {
+# Maybe one day convert this block of bash into something that returns
+# all matching commit ids, but it's very slow...
+#
+#               echo "checking commits $1..."
+#               git rev-list --remotes | grep -i "^$1" |
+#               while read line ; do
+#                   git log --format='%H %s' -1 $line |
+#                   echo "commit $(cut -c 1-12,41-)"
+#               done
+        } elsif ($lines[0] =~ /^fatal: ambiguous argument '$commit': unknown revision or path not in the working tree\./) {
+        } else {
+                $id = substr($lines[0], 0, 12);
+                $desc = substr($lines[0], 41);
+        }
+
+        return ($id, $desc);
+}
+
 $chk_signoff = 0 if ($file);
 
 my @rawlines = ();
 my @lines = ();