Merge tag 'v3.14-rc5' into HEAD
Linux 3.14-rc5
This commit is contained in:
@@ -152,6 +152,7 @@ ld_flags = $(LDFLAGS) $(ldflags-y)
|
||||
dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
|
||||
-I$(srctree)/arch/$(SRCARCH)/boot/dts \
|
||||
-I$(srctree)/arch/$(SRCARCH)/boot/dts/include \
|
||||
-I$(srctree)/drivers/of/testcase-data \
|
||||
-undef -D__DTS__
|
||||
|
||||
# Finds the multi-part object the current object will be linked into
|
||||
|
||||
@@ -471,7 +471,7 @@ sub seed_camelcase_includes {
|
||||
|
||||
$camelcase_seeded = 1;
|
||||
|
||||
if (-d ".git") {
|
||||
if (-e ".git") {
|
||||
my $git_last_include_commit = `git log --no-merges --pretty=format:"%h%n" -1 -- include`;
|
||||
chomp $git_last_include_commit;
|
||||
$camelcase_cache = ".checkpatch-camelcase.git.$git_last_include_commit";
|
||||
@@ -499,7 +499,7 @@ sub seed_camelcase_includes {
|
||||
return;
|
||||
}
|
||||
|
||||
if (-d ".git") {
|
||||
if (-e ".git") {
|
||||
$files = `git ls-files "include/*.h"`;
|
||||
@include_files = split('\n', $files);
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ my %VCS_cmds;
|
||||
|
||||
my %VCS_cmds_git = (
|
||||
"execute_cmd" => \&git_execute_cmd,
|
||||
"available" => '(which("git") ne "") && (-d ".git")',
|
||||
"available" => '(which("git") ne "") && (-e ".git")',
|
||||
"find_signers_cmd" =>
|
||||
"git log --no-color --follow --since=\$email_git_since " .
|
||||
'--numstat --no-merges ' .
|
||||
|
||||
@@ -210,8 +210,8 @@ static void do_usb_entry(void *symval,
|
||||
range_lo < 0x9 ? "[%X-9" : "[%X",
|
||||
range_lo);
|
||||
sprintf(alias + strlen(alias),
|
||||
range_hi > 0xA ? "a-%X]" : "%X]",
|
||||
range_lo);
|
||||
range_hi > 0xA ? "A-%X]" : "%X]",
|
||||
range_hi);
|
||||
}
|
||||
}
|
||||
if (bcdDevice_initial_digits < (sizeof(bcdDevice_lo) * 2 - 1))
|
||||
|
||||
Reference in New Issue
Block a user