linux-next: manual merge of the risc-v tree with the kbuild tree

linux-next: manual merge of the risc-v tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]

Hi all,

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

  arch/riscv/Makefile

between commit:

  8212f8986d31 ("kbuild: use more subdir- for visiting subdirectories while cleaning")

from the kbuild tree and commit:

  5d4595db0e1c ("riscv: add rv32 and rv64 randconfig build targets")

from the risc-v 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/riscv/Makefile
index 753e13f3a9d2,9247407b95d6..000000000000
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@@ -135,3 -137,16 +135,13 @@@ zinstall: install-image = Image.g
  install zinstall:
  	$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
  	$(boot)/$(install-image) System.map "$(INSTALL_PATH)"
+ 
 -archclean:
 -	$(Q)$(MAKE) $(clean)=$(boot)
 -
+ PHONY += rv32_randconfig
+ rv32_randconfig:
+ 	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/riscv/configs/32-bit.config \
+ 		-f $(srctree)/Makefile randconfig
+ 
+ PHONY += rv64_randconfig
+ rv64_randconfig:
+ 	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/riscv/configs/64-bit.config \
+ 		-f $(srctree)/Makefile randconfig

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]