diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 11:06:50 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 11:06:50 +0300 |
| commit | b3bb164aa56018ad8476dd2953b654491b7fb468 (patch) | |
| tree | 781240b23aa2613222aac1aa633a9e4f86a934ec /scripts | |
| parent | f59aba2f75795e5b6a4f1aa31f3e20d7b71ca804 (diff) | |
| parent | d1eef1c619749b2a57e514a3fa67d9a516ffa919 (diff) | |
| download | linux-b3bb164aa56018ad8476dd2953b654491b7fb468.tar.xz | |
Merge 5.5-rc2 into staging-next
We want the staging driver fixes in here, and this resolves merge issues
with the isdn code that was pointed out in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 7cbe6e72e363..a63380c6b0d2 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -4125,15 +4125,6 @@ sub process { "Prefer [subsystem eg: netdev]_$level2([subsystem]dev, ... then dev_$level2(dev, ... then pr_$level(... to printk(KERN_$orig ...\n" . $herecurr); } - if ($line =~ /\bpr_warning\s*\(/) { - if (WARN("PREFER_PR_LEVEL", - "Prefer pr_warn(... to pr_warning(...\n" . $herecurr) && - $fix) { - $fixed[$fixlinenr] =~ - s/\bpr_warning\b/pr_warn/; - } - } - if ($line =~ /\bdev_printk\s*\(\s*KERN_([A-Z]+)/) { my $orig = $1; my $level = lc($orig); |