diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 06:16:39 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 06:16:39 +0300 |
| commit | 8e04221029067cbaff3fc8f4daf991532afbcbaf (patch) | |
| tree | 18cf757bcd315c76f5f458aa72a0a57db0a78985 /scripts | |
| parent | 9ad62ec4f752c82b39aa5927f23d894b46ae10b9 (diff) | |
| parent | 2c940db250c1610d95ea5331dc819b8bd4db96ae (diff) | |
| download | linux-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.xz | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/get_maintainer.pl | 4 | ||||
| -rw-r--r-- | scripts/markup_oops.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 090f24839700..2f3230db7ffb 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -74,8 +74,8 @@ my %VCS_cmds; my %VCS_cmds_git = ( "execute_cmd" => \&git_execute_cmd, "available" => '(which("git") ne "") && (-d ".git")', - "find_signers_cmd" => "git log --since=\$email_git_since -- \$file", - "find_commit_signers_cmd" => "git log -1 \$commit", + "find_signers_cmd" => "git log --no-color --since=\$email_git_since -- \$file", + "find_commit_signers_cmd" => "git log --no-color -1 \$commit", "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", "blame_file_cmd" => "git blame -l \$file", "commit_pattern" => "^commit [0-9a-f]{40,40}", diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl index ce3e40b01e48..e950f9cde019 100644 --- a/scripts/markup_oops.pl +++ b/scripts/markup_oops.pl @@ -158,7 +158,7 @@ while (<STDIN>) { $function = $1; $func_offset = $2; } - if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\] \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]/) { + if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\] \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+0x([0-9a-f]+)\/0x[a-f0-9]/) { $function = $1; $func_offset = $2; } |