linux-next: manual merge of the xtensa tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/xtensa/Makefile

between commit:

  37c8a5fafa3b ("kbuild: consolidate Devicetree dtb build rules")

from Linus' tree (it precedes v4.20-rc1) and commit:

  7c17225f2059 ("xtensa: generate uapi header and syscall table header files")

from the xtensa 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 arch/xtensa/Makefile
index be060dfb1cc3,1e7b179eb6fe..000000000000
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@@ -90,6 -93,15 +90,9 @@@ boot		:= arch/xtensa/boo
  all Image zImage uImage: vmlinux
  	$(Q)$(MAKE) $(build)=$(boot) $@
  
 -%.dtb:
 -	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 -
 -dtbs: scripts
 -	$(Q)$(MAKE) $(build)=$(boot)/dts
 -
+ archheaders:
+ 	$(Q)$(MAKE) $(build)=arch/xtensa/kernel/syscalls all
+ 
  define archhelp
    @echo '* Image       - Kernel ELF image with reset vector'
    @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'

Attachment: pgp3dIyMatSbd.pgp
Description: OpenPGP digital signature