From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 May 2019 19:25:12 +0000 (-0700)
Subject: Merge tag 'kbuild-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2646719a48c21ba0cae82a3f57382a9573fd8400;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'kbuild-v5.2' of git://git./linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild updates from Masahiro Yamada:

 - allow users to invoke 'make' out of the source tree

 - refactor scripts/mkmakefile

 - deprecate KBUILD_SRC, which was used to track the source tree
   location for O= build.

 - fix recordmcount.pl in case objdump output is localized

 - turn unresolved symbols in external modules to errors from warnings
   by default; pass KBUILD_MODPOST_WARN=1 to get them back to warnings

 - generate modules.builtin.modinfo to collect .modinfo data from
   built-in modules

 - misc Makefile cleanups

* tag 'kbuild-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (21 commits)
  .gitignore: add more all*.config patterns
  moduleparam: Save information about built-in modules in separate file
  Remove MODULE_ALIAS() calls that take undefined macro
  .gitignore: add leading and trailing slashes to generated directories
  scripts/tags.sh: fix direct execution of scripts/tags.sh
  scripts: override locale from environment when running recordmcount.pl
  samples: kobject: allow CONFIG_SAMPLE_KOBJECT to become y
  samples: seccomp: turn CONFIG_SAMPLE_SECCOMP into a bool option
  kbuild: move Documentation to vmlinux-alldirs
  kbuild: move samples/ to KBUILD_VMLINUX_OBJS
  modpost: make KBUILD_MODPOST_WARN also configurable for external modules
  kbuild: check arch/$(SRCARCH)/include/generated before out-of-tree build
  kbuild: remove unneeded dependency for include/config/kernel.release
  memory: squash drivers/memory/Makefile.asm-offsets
  kbuild: use $(srctree) instead of KBUILD_SRC to check out-of-tree build
  kbuild: mkmakefile: generate a simple wrapper of top Makefile
  kbuild: mkmakefile: do not check the generated Makefile marker
  kbuild: allow Kbuild to start from any directory
  kbuild: pass $(MAKECMDGOALS) to sub-make as is
  kbuild: fix warning "overriding recipe for target 'Makefile'"
  ...
---

2646719a48c21ba0cae82a3f57382a9573fd8400
diff --cc Documentation/dontdiff
index 93693775639f,512fa0239ebf..48e1930fb4a4
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@@ -176,9 -176,9 +176,10 @@@ mkpre
  mkregtable
  mktables
  mktree
 +mkutf8data
  modpost
  modules.builtin
+ modules.builtin.modinfo
  modules.order
  modversions.h*
  nconf
diff --cc samples/Makefile
index 2484cc262d3e,50f858612148..8e096e0d45d1
--- a/samples/Makefile
+++ b/samples/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  # Makefile for Linux samples code
  
- obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
+ obj-y			+= kobject/ kprobes/ trace_events/ livepatch/ \
  			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
  			   configfs/ connector/ v4l/ trace_printk/ \
 -			   vfio-mdev/ statx/ qmi/ binderfs/
 +			   vfio-mdev/ vfs/ qmi/ binderfs/ pidfd/