Merge branch 'linus' into perf/core

Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 865718f4bcea..f6c206a5b01a 100644
--- a/Makefile
+++ b/Makefile
@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO
         localver-extra = $(scm-identifier)
 else
         ifneq ($(scm-identifier),)
-                ifeq ($(LOCALVERSION),)
+                ifeq ("$(origin LOCALVERSION)", "undefined")
                         localver-extra = +
                 endif
         endif