Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1443949

linux-next: manual merge of the devicetree tree with the arc tree

Show all headers | View raw

Hi Rob,

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

  arch/arc/kernel/setup.c

between commit:

  1ce0b5857f66 ("ARC: fix linux-next build breakage")

from the arc tree and commit:

  61c78644e7f1 ("arc: Remove unnecessary of_platform_populate with default match table")

from the devicetree 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/arc/kernel/setup.c
index 5f8c0b47045a,584c5f064ff3..000000000000
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@@ -14,8 -14,6 +14,7 @@@
  #include <linux/module.h>
  #include <linux/cpu.h>
  #include <linux/of_fdt.h>
 +#include <linux/of.h>
- #include <linux/of_platform.h>
  #include <linux/cache.h>
  #include <asm/sections.h>
  #include <asm/arcregs.h>

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the devicetree tree with the arc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-15 07:20 +0200

csiph-web