diff --git a/[refs] b/[refs]
index fd30cfef0c61..f42e7a5b7996 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb766766f3f2f6d9326c561b1020590642c6e39
+refs/heads/master: f4a8773676c21a68b0666fbe48af4fe1af89dfa9
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 45eb0ae98eba..c71a0fae84df 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2560,7 +2560,7 @@ sub process {
 		if ($line =~ /\bin_atomic\s*\(/) {
 			if ($realfile =~ m@^drivers/@) {
 				ERROR("do not use in_atomic in drivers\n" . $herecurr);
-			} else {
+			} elsif ($realfile !~ m@^kernel/@) {
 				WARN("use of in_atomic() is incorrect outside core kernel code\n" . $herecurr);
 			}
 		}