diff --git a/[refs] b/[refs] index 5070de76fbc3..d9b668281ec0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 428e2fdc4ecee2312829e97549f99c12312f4faf +refs/heads/master: b05317221b7607ba61ee921c31867ed08912aa46 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 5c9672951077..0e158667d478 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -210,10 +210,10 @@ sub help { our $logFunctions = qr{(?x: printk| - pr_(debug|dbg|vdbg|devel|info|warning|err|notice|alert|crit|emerg|cont)| - (dev|netdev|netif)_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)| + [a-z]+_(emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)| WARN| - panic + panic| + MODULE_[A-Z_]+ )}; our @typeList = (