The patch titled Subject: checkpatch: fix TYPO_SPELLING check for words with apostrophe has been added to the -mm tree. Its filename is checkpatch-fix-typo_spelling-check-for-words-with-apostrophe.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/checkpatch-fix-typo_spelling-check-for-words-with-apostrophe.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/checkpatch-fix-typo_spelling-check-for-words-with-apostrophe.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/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Dwaipayan Ray <dwaipayanray1@xxxxxxxxx> Subject: checkpatch: fix TYPO_SPELLING check for words with apostrophe checkpatch reports a false TYPO_SPELLING warning for some words containing an apostrophe when run with --codespell option. A false positive is "doesn't". Occurrence of the word causes checkpatch to emit the following warning: "WARNING: 'doesn'' may be misspelled - perhaps 'doesn't'?" Modify the regex pattern to be more in line with the codespell default word matching regex. This fixes the word capture and avoids the false warning. In addition, highlight the misspelled word location by adding a caret below the word. Link: https://lkml.kernel.org/r/20201201190729.169733-1-dwaipayanray1@xxxxxxxxx Signed-off-by: Dwaipayan Ray <dwaipayanray1@xxxxxxxxx> Suggested-by: Joe Perches <joe@xxxxxxxxxxx> Reported-by: Peilin Ye <yepeilin.cs@xxxxxxxxx> Acked-by: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/scripts/checkpatch.pl~checkpatch-fix-typo_spelling-check-for-words-with-apostrophe +++ a/scripts/checkpatch.pl @@ -3182,15 +3182,18 @@ sub process { # Check for various typo / spelling mistakes if (defined($misspellings) && ($in_commit_log || $line =~ /^(?:\+|Subject:)/i)) { - while ($rawline =~ /(?:^|[^a-z@])($misspellings)(?:\b|$|[^a-z@])/gi) { + while ($rawline =~ /(?:^|[^\w\-'`])($misspellings)(?:[^\w\-'`]|$)/gi) { my $typo = $1; + my $blank = copy_spacing($rawline); + my $ptr = substr($blank, 0, $-[1]) . "^"; + my $hereptr = "$hereline$ptr\n"; my $typo_fix = $spelling_fix{lc($typo)}; $typo_fix = ucfirst($typo_fix) if ($typo =~ /^[A-Z]/); $typo_fix = uc($typo_fix) if ($typo =~ /^[A-Z]+$/); my $msg_level = \&WARN; $msg_level = \&CHK if ($file); if (&{$msg_level}("TYPO_SPELLING", - "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $herecurr) && + "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $hereptr) && $fix) { $fixed[$fixlinenr] =~ s/(^|[^A-Za-z@])($typo)($|[^A-Za-z@])/$1$typo_fix$3/; } _ Patches currently in -mm which might be from dwaipayanray1@xxxxxxxxx are checkpatch-add-new-exception-to-repeated-word-check.patch checkpatch-extend-attributes-check-to-handle-more-patterns.patch checkpatch-improve-email-parsing.patch checkpatch-fix-spelling-errors-and-remove-repeated-word.patch checkpatch-fix-unescaped-left-brace.patch checkpatch-add-warning-for-unnecessary-use-of-%h-and-%hh.patch checkpatch-add-warning-for-lines-starting-with-a-in-commit-log.patch checkpatch-fix-typo_spelling-check-for-words-with-apostrophe.patch