History

Merge 4.8-rc5 into char-misc-next

We want the fixes in here for merging and testing.

Greg Kroah-Hartman committed 10 years ago

Commit fbc1ec22 parents 02baff3 c693593812 files · +8965 −4628Browse files

Showing the changes to scripts (3 of 812 files). Show all

Unified · Split

3 files
  1. scripts/checkpatch.pl +0 −9
  2. scripts/get_maintainer.pl +3 −1
  3. scripts/tags.sh +0 −1
scripts/checkpatch.pl+0−9
@@ -3570,15 +3570,6 @@ sub process { · 3569 unmodified lines
35703570 }
35713571 }
35723572
3573−# check for uses of DEFINE_PCI_DEVICE_TABLE
3574− if ($line =~ /\bDEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=/) {
3575− if (WARN("DEFINE_PCI_DEVICE_TABLE",
3576− "Prefer struct pci_device_id over deprecated DEFINE_PCI_DEVICE_TABLE\n" . $herecurr) &&
3577− $fix) {
3578− $fixed[$fixlinenr] =~ s/\b(?:static\s+|)DEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=\s*/static const struct pci_device_id $1\[\] = /;
3579− }
3580− }
3581−
35823573 # check for new typedefs, only function parameters and sparse annotations
35833574 # make sense.
35843575 if ($line =~ /\btypedef\s/ &&
scripts/get_maintainer.pl+3−1
@@ -2136,9 +2136,11 @@ sub vcs_file_exists { · 2135 unmodified lines
21362136
21372137 my $cmd = $VCS_cmds{"file_exists_cmd"};
21382138 $cmd =~ s/(\$\w+)/$1/eeg; # interpolate $cmd
2139−
2139+ $cmd .= " 2>&1";
21402140 $exists = &{$VCS_cmds{"execute_cmd"}}($cmd);
21412141
2142+ return 0 if ($? != 0);
2143+
21422144 return $exists;
21432145 }
21442146
scripts/tags.sh+0−1
@@ -206,7 +206,6 @@ regex_c=( · 205 unmodified lines
206206 '/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/'
207207 '/\<DECLARE_WAIT_QUEUE_HEAD(\([[:alnum:]_]*\)/\1/v/'
208208 '/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'
209− '/\<DEFINE_PCI_DEVICE_TABLE(\([[:alnum:]_]*\)/\1/v/'
210209 '/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
211210 '/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
212211 '/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t