diff --git a/[refs] b/[refs]
index f42e7a5b7996..cde5a6c6fb28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4a8773676c21a68b0666fbe48af4fe1af89dfa9
+refs/heads/master: e2f7aa4b8bc811ebf8afbdf423caf90a5a03cb08
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index c71a0fae84df..5ffc940399be 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1240,7 +1240,8 @@ sub process {
 			$realfile =~ s@^([^/]*)/@@;
 
 			$p1_prefix = $1;
-			if ($tree && $p1_prefix ne '' && -e "$root/$p1_prefix") {
+			if (!$file && $tree && $p1_prefix ne '' &&
+			    -e "$root/$p1_prefix") {
 				WARN("patch prefix '$p1_prefix' exists, appears to be a -p0 patch\n");
 			}