diff --git a/[refs] b/[refs]
index 9d83666dbe66..05c0a3ecff1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2172eb5bd4b7d06577113ec40635083619ca54a
+refs/heads/master: b8f96a31f38c8e9fc75f0a89c6815e7cbc402858
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 53ec3946670d..775f2b146aa1 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1860,7 +1860,8 @@ sub process {
 # multi-statement macros should be enclosed in a do while loop, grab the
 # first statement and ensure its the whole macro if its not enclosed
 # in a known good container
-		if ($line =~ /^.\s*\#\s*define\s*$Ident(\()?/) {
+		if ($realfile !~ m@/vmlinux.lds.h$@ &&
+		    $line =~ /^.\s*\#\s*define\s*$Ident(\()?/) {
 			my $ln = $linenr;
 			my $cnt = $realcnt;
 			my ($off, $dstat, $dcond, $rest);