diff --git a/[refs] b/[refs]
index 957911774ae3..957115e8b89e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5abe257af8b95857b95fa0ba694530b446ae32d8
+refs/heads/master: 495e9d84607cda966ba6d223d5eb9df0070cd21a
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 1d6e4c541370..4d2c7dfdaabd 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2226,8 +2226,11 @@ sub process {
 			my $path = $1;
 			if ($path =~ m{//}) {
 				ERROR("MALFORMED_INCLUDE",
-				      "malformed #include filename\n" .
-					$herecurr);
+				      "malformed #include filename\n" . $herecurr);
+			}
+			if ($path =~ "^uapi/" && $realfile =~ m@\binclude/uapi/@) {
+				ERROR("UAPI_INCLUDE",
+				      "No #include in ...include/uapi/... should use a uapi/ path prefix\n" . $herecurr);
 			}
 		}