[lkml]   [2021]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the risc-v tree with Linus' tree
Hi all,

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


between commit:

89d4f98ae90d ("ARM: remove zte zx platform")

from Linus' tree and commits:

08734e0581a5 ("riscv: Use vendor name for K210 SoC support")
e134d426e1a3 ("soc: canaan: Sort the Makefile alphabetically")

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.

Stephen Rothwell

diff --cc drivers/soc/Makefile
index 9bceb12b291d,34b23645be14..000000000000
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -28,4 -29,4 +29,3 @@@ obj-y += ti
obj-$(CONFIG_ARCH_U8500) += ux500/
obj-$(CONFIG_PLAT_VERSATILE) += versatile/
obj-y += xilinx/
- obj-$(CONFIG_SOC_KENDRYTE) += kendryte/
-obj-$(CONFIG_ARCH_ZX) += zte/
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2021-02-23 23:03    [W:0.068 / U:0.808 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site