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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 20 Dec 2018 15:57:56 +1100

Hi all,

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

  Makefile

between commits:

  65bba0423ecf ("kbuild: fix UML build error with CONFIG_GCC_PLUGINS")
  059bc9fc375e ("kbuild: make 'archprepare' depend on 'scripts'")
  ce2fd53a10c7 ("kbuild: descend into scripts/gcc-plugins/ via scripts/Makefile")

from the kbuild tree and commit:

  6ac389346e69 ("Revert "kbuild/Makefile: Prepare for using macros in inline assembly code to work around asm() related GCC inlining bugs"")

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 Makefile
index 6ae8a5382d5d,885c74b192f9..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -1104,12 -1104,9 +1104,10 @@@ prepare2: prepare3 outputmakefile asm-g
  prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
  	$(cmd_crmodverdir)
  
- macroprepare: prepare1 archmacros
- 
- archprepare: archheaders archscripts macroprepare scripts
 -archprepare: archheaders archscripts prepare1 scripts_basic
++archprepare: archheaders archscripts prepare1 scripts
  
 -prepare0: archprepare gcc-plugins
 +prepare0: archprepare
 +	$(Q)$(MAKE) $(build)=scripts/mod
  	$(Q)$(MAKE) $(build)=.
  
  # All the preparing..