Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

2 files changed, 56 insertions, 9 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 3dfc47134e51..5e93342d22f9 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -240,9 +240,8 @@ our $NonptrType;
 our $Type;
 our $Declare;
 
-our $UTF8       = qr {
-        [\x09\x0A\x0D\x20-\x7E]              # ASCII
-        | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+our $NON_ASCII_UTF8     = qr{
+        [\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
         |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
         | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
         |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
@@ -251,6 +250,11 @@ our $UTF8	= qr {
         |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
 }x;
 
+our $UTF8       = qr{
+        [\x09\x0A\x0D\x20-\x7E]              # ASCII
+        | $NON_ASCII_UTF8
+}x;
+
 our $typeTypedefs = qr{(?x:
         (?:__)?(?:u|s|be|le)(?:8|16|32|64)|
         atomic_t
@@ -1330,6 +1334,9 @@ sub process {
         my $signoff = 0;
         my $is_patch = 0;
 
+        my $in_header_lines = 1;
+        my $in_commit_log = 0;          #Scanning lines before patch
+
         our @report = ();
         our $cnt_lines = 0;
         our $cnt_error = 0;
@@ -1497,7 +1504,6 @@ sub process {
                 if ($line =~ /^diff --git.*?(\S+)$/) {
                         $realfile = $1;
                         $realfile =~ s@^([^/]*)/@@;
-
                 } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
                         $realfile = $1;
                         $realfile =~ s@^([^/]*)/@@;
@@ -1536,6 +1542,7 @@ sub process {
 # Check the patch for a signoff:
                 if ($line =~ /^\s*signed-off-by:/i) {
                         $signoff++;
+                        $in_commit_log = 0;
                 }
 
 # Check signature styles
@@ -1613,6 +1620,21 @@ sub process {
                             "Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
                 }
 
+# Check if it's the start of a commit log
+# (not a header line and we haven't seen the patch filename)
+                if ($in_header_lines && $realfile =~ /^$/ &&
+                    $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
+                        $in_header_lines = 0;
+                        $in_commit_log = 1;
+                }
+
+# Still not yet in a patch, check for any UTF-8
+                if ($in_commit_log && $realfile =~ /^$/ &&
+                    $rawline =~ /$NON_ASCII_UTF8/) {
+                        CHK("UTF8_BEFORE_PATCH",
+                            "8-bit UTF-8 used in possible commit log\n" . $herecurr);
+                }
+
 # ignore non-hunk lines and lines being removed
                 next if (!$hunk_line || $line =~ /^-/);
 
@@ -2932,11 +2954,11 @@ sub process {
                                 }
                         }
                         if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
-                                my $herectx = $here . "\n";;
+                                my $herectx = $here . "\n";
                                 my $cnt = statement_rawlines($block);
 
                                 for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";;
+                                        $herectx .= raw_line($linenr, $n) . "\n";
                                 }
 
                                 WARN("BRACES",
@@ -3151,10 +3173,10 @@ sub process {
                              "consider using a completion\n" . $herecurr);
 
                 }
-# recommend kstrto* over simple_strto*
-                if ($line =~ /\bsimple_(strto.*?)\s*\(/) {
+# recommend kstrto* over simple_strto* and strict_strto*
+                if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) {
                         WARN("CONSIDER_KSTRTO",
-                             "consider using kstrto* in preference to simple_$1\n" . $herecurr);
+                             "$1 is obsolete, use k$3 instead\n" . $herecurr);
                 }
 # check for __initcall(), use device_initcall() explicitly please
                 if ($line =~ /^.\s*__initcall\s*\(/) {
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e26e2fb462d4..f936d1fa969d 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -735,6 +735,27 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
         return 1;
 }
 
+/*
+ * Looks like: vmbus:guid
+ * Each byte of the guid will be represented by two hex characters
+ * in the name.
+ */
+
+static int do_vmbus_entry(const char *filename, struct hv_vmbus_device_id *id,
+                          char *alias)
+{
+        int i;
+        char guid_name[((sizeof(id->guid) + 1)) * 2];
+
+        for (i = 0; i < (sizeof(id->guid) * 2); i += 2)
+                sprintf(&guid_name[i], "%02x", id->guid[i/2]);
+
+        strcpy(alias, "vmbus:");
+        strcat(alias, guid_name);
+
+        return 1;
+}
+
 /* Looks like: i2c:S */
 static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
                         char *alias)
@@ -994,6 +1015,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct virtio_device_id), "virtio",
                          do_virtio_entry, mod);
+        else if (sym_is(symname, "__mod_vmbus_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct hv_vmbus_device_id), "vmbus",
+                         do_vmbus_entry, mod);
         else if (sym_is(symname, "__mod_i2c_device_table"))
                 do_table(symval, sym->st_size,
                          sizeof(struct i2c_device_id), "i2c",