diff --git a/[refs] b/[refs]
index b0a1a2d36350..3e0f46ed635b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94e2959e7a6a4ef0969932c30349ce6f4469a3cf
+refs/heads/master: 691d77b6b85c20e4166bafd12bd0131b28f95a16
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index f88bb3e21cda..826cdbac0114 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2466,6 +2466,15 @@ sub process {
 				last;
 			}
 		}
+
+# whine mightly about in_atomic
+		if ($line =~ /\bin_atomic\s*\(/) {
+			if ($realfile =~ m@^drivers/@) {
+				ERROR("do not use in_atomic in drivers\n" . $herecurr);
+			} else {
+				WARN("use of in_atomic() is incorrect outside core kernel code\n" . $herecurr);
+			}
+		}
 	}
 
 	# If we have no input at all, then there is nothing to report on