Subject: linux-next: manual merge of the tip tree with the kbuild tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 26 Feb 2019 13:48:35 +1100

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  Kbuild

between commits:

  86948e2a69de ("scripts/gdb: delay generation of gdb constants.py")
  f4d5577af6d3 ("kbuild: remove unimportant comments from ./Kbuild")

from the kbuild tree and commit:

  8d32588077bd ("locking/atomics: Check generated headers are up-to-date")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Kbuild
index a07bbd62f052,4a4c47c38d1d..000000000000
--- a/Kbuild
+++ b/Kbuild
@@@ -50,5 -59,27 +50,18 @@@ quiet_cmd_syscalls = CALL    $
  missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE
  	$(call cmd,syscalls)
  
+ #####
 -# 5) Check atomic headers are up-to-date
++# Check atomic headers are up-to-date
+ #
+ 
+ always += old-atomics
+ targets += old-atomics
+ 
+ quiet_cmd_atomics = CALL    $<
+       cmd_atomics = $(CONFIG_SHELL) $<
+ 
+ old-atomics: scripts/atomic/check-atomics.sh FORCE
+ 	$(call cmd,atomics)
+ 
 -#####
 -# 6) Generate constants for Python GDB integration
 -#
 -
 -extra-$(CONFIG_GDB_SCRIPTS) += build_constants_py
 -
 -build_constants_py: $(timeconst-file) $(bounds-file)
 -	@$(MAKE) $(build)=scripts/gdb/linux $@
 -
  # Keep these three files during make clean
  no-clean-files := $(bounds-file) $(offsets-file) $(timeconst-file)