]> www.infradead.org Git - users/willy/linux.git/commitdiff
Merge remote-tracking branch 'kbuild/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 21:31:23 +0000 (08:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 21:31:23 +0000 (08:31 +1100)
1  2 
Makefile
arch/arc/Kconfig
arch/arm64/Kconfig
arch/x86/Kconfig
arch/x86/kernel/head64.c
init/Kconfig
scripts/Makefile.build

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
index 6a6be9f440cf940358a0236b6ad13360fed253ca,aa05423c8418a52044570be6bfb10c978cc76941..6d18e2bb1e1d9273ad56527c9fddabe79ef5b6b4
@@@ -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