diff --git a/[refs] b/[refs]
index 259bd3328e62..da29a96b7e1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bd49efe4e4bf88d9c1026db50325fd1b2e59519
+refs/heads/master: 2a1bc5d5c5096f2dfb6f8b18f39ecb718f101535
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 6ddae89c3cfa..c7980ff2975e 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2392,6 +2392,7 @@ sub process {
 		my $string;
 		while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
 			$string = substr($rawline, $-[1], $+[1] - $-[1]);
+			$string =~ s/%%/__/g;
 			if ($string =~ /(?<!%)%L[udi]/) {
 				WARN("\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
 				last;