diff --git a/.travis.yml b/.travis.yml
index a75aac508de299..6b7409f158eeff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,10 @@ jobs:
   include:
     - if: type = pull_request
       name: checkpatch
-      script:
+      script: # FIXME: replace with TRAVIS_COMMIT_RANGE or similiar
         - SHA_PR=`git log --oneline -1 | sed -rn "s/.*Merge (.*) into.*/\1/p"`
         - SHA_MAIN=`git log --oneline -1 | sed -rn "s/.*Merge .* into (.*)/\1/p"`
+        - git fetch https://github.com/marc-hb/linux checkpatch-strict-not-fatal && git cherry-pick FETCH_HEAD
         - scripts/checkpatch.pl --strict --codespell -g $SHA_MAIN..$SHA_PR
     - name: "Code Scan"
       script:
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a63380c6b0d20f..04e7f3272cfe48 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2904,7 +2904,7 @@ sub process {
 				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;
+				my $msg_level = \&CHK;
 				$msg_level = \&CHK if ($file);
 				if (&{$msg_level}("TYPO_SPELLING",
 						  "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $herecurr) &&