From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 9 Dec 2018 21:31:23 +0000 (+1100)
Subject: Merge remote-tracking branch 'kbuild/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dbd01bd6697c3f3dd0b583fb164ce3775e97f033;p=users%2Fwilly%2Flinux.git

Merge remote-tracking branch 'kbuild/for-next'
---

dbd01bd6697c3f3dd0b583fb164ce3775e97f033
diff --cc scripts/Makefile.build
index 6a6be9f440cf,aa05423c8418..6d18e2bb1e1d
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@@ -236,16 -230,11 +230,9 @@@ ifdef CONFIG_GCOV_KERNE
  objtool_args += --no-unreachable
  endif
  ifdef CONFIG_RETPOLINE
 -ifneq ($(RETPOLINE_CFLAGS),)
    objtool_args += --retpoline
  endif
 -endif
  
- 
- ifdef CONFIG_MODVERSIONS
- objtool_o = $(@D)/.tmp_$(@F)
- else
- objtool_o = $(@)
- endif
- 
  # 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory
  # 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file
  # 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file