The patch titled scripts/checkpatch.pl: add more exceptions to 80 char lines has been added to the -mm tree. Its filename is scripts-checkpatchpl-add-more-exceptions-to-80-char-lines.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: scripts/checkpatch.pl: add more exceptions to 80 char lines From: Joe Perches <joe@xxxxxxxxxxx> Add new logging functions netdev_<level> and netif_<level>. Don't complain if the only thing on a line is a quoted string. Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Cc: Andy Whitcroft <apw@xxxxxxxxxxxx> Cc: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN scripts/checkpatch.pl~scripts-checkpatchpl-add-more-exceptions-to-80-char-lines scripts/checkpatch.pl --- a/scripts/checkpatch.pl~scripts-checkpatchpl-add-more-exceptions-to-80-char-lines +++ a/scripts/checkpatch.pl @@ -195,7 +195,7 @@ our $typeTypedefs = qr{(?x: our $logFunctions = qr{(?x: printk| pr_(debug|dbg|vdbg|devel|info|warning|err|notice|alert|crit|emerg|cont)| - dev_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)| + (dev|netdev|netif)_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)| WARN| panic )}; @@ -1409,7 +1409,8 @@ sub process { #80 column limit if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ && $rawline !~ /^.\s*\*\s*\@$Ident\s/ && - $line !~ /^\+\s*$logFunctions\s*\(\s*(?:KERN_\S+\s*)?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ && + !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ || + $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) && $length > 80) { WARN("line over 80 characters\n" . $herecurr); _ Patches currently in -mm which might be from joe@xxxxxxxxxxx are linux-next.patch drivers-scsi-correct-the-size-argument-to-kmalloc.patch drivers-scsi-qla2xxx-qla_osc-fix-continuation-line-formats.patch drivers-scsi-chc-dont-use-vprintk-as-macro.patch kernelh-remove-unused-nipquad-and-nipquad_fmt.patch maintainers-update-arm-bcmring-mtd-nand-driver-file-patterns.patch maintainers-update-arm-nuvoton-w90x900-arm-architecture-file-patterns.patch maintainers-update-arm-voipac-pxa270-file-patterns.patch maintainers-update-arm-zipit-z2-support-file-patterns.patch maintainers-update-networking-file-patterns.patch maintainers-update-ppp-over-l2tp-file-patterns.patch maintainers-update-ricoh-smartmedia-xd-driver-file-patterns.patch maintainers-remove-section-smx-uio-interface.patch maintainers-update-spear-clock-framework-support-file-patterns.patch maintainers-remove-section-strip.patch maintainers-remove-section-wavelan-network-driver-wireless-extensions.patch maintainers-add-file-patterns-to-uclinux-for-renesas-h8-300.patch maintainers-update-drm-drivers-patterns.patch maintainers-add-patterns-to-cryptographic-random-number-generator.patch maintainers-add-patterns-to-dell-wmi-extras.patch maintainers-add-patterns-to-powerpc-embedded-ppc8xx.patch maintainers-add-patterns-to-omap-usb.patch maintainers-remove-section-promise-dc4030.patch maintainers-add-patterns-to-ps3vram-driver.patch maintainers-add-patterns-to-wimax-stack.patch maintainers-update-laurent-pinchart-email.patch maintainers-orphan-befs.patch checkpatchpl-add-check-for-space-after-struct-or-union-definition.patch scripts-checkpatchpl-add-more-exceptions-to-80-char-lines.patch documentation-networking-wavelantxt-deleted-not-in-tree.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html