From: Michal Marek <mmarek@suse.cz>
Date: Wed, 25 Feb 2015 13:47:06 +0000 (+0100)
Subject: Merge commit 'v4.0-rc1^0' into kbuild/for-next
X-Git-Tag: KARO-TXA5-2015-06-26~99^2~5
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ebb5cb3da1d79a0e92abb2f28c273ed7b4ec11ae;p=karo-tx-linux.git

Merge commit 'v4.0-rc1^0' into kbuild/for-next
---

ebb5cb3da1d79a0e92abb2f28c273ed7b4ec11ae
diff --cc Makefile
index 6b486c01c8c7,9fab639727c7..abf7bb1556c8
--- a/Makefile
+++ b/Makefile
@@@ -792,8 -781,8 +797,9 @@@ ifeq ($(shell $(CONFIG_SHELL) $(srctree
  	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
  endif
  
+ include $(srctree)/scripts/Makefile.kasan
  include $(srctree)/scripts/Makefile.extrawarn
 +include ${srctree}/scripts/Makefile.lto
  
  # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
  KBUILD_CPPFLAGS += $(KCPPFLAGS)