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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  include/linux/of_fdt.h

between commit:

  7ca964c3978d ("efi: apply memblock cap after memblock_add()")

from the devicetree-fixes tree and commits:

  60f20d84dc81 ("of/fdt: Rework early_init_dt_scan_chosen() to call directly")
  1f012283e936 ("of/fdt: Rework early_init_dt_scan_memory() to call directly")

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 include/linux/of_fdt.h
index ad09beb6d13c,914739f3c192..000000000000
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@@ -58,11 -58,8 +58,9 @@@ extern int of_flat_dt_is_compatible(uns
  extern unsigned long of_get_flat_dt_root(void);
  extern uint32_t of_get_flat_dt_phandle(unsigned long node);
  
- extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
- 				     int depth, void *data);
- extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
- 				     int depth, void *data);
+ extern int early_init_dt_scan_chosen(char *cmdline);
+ extern int early_init_dt_scan_memory(void);
 +extern void early_init_dt_check_for_usable_mem_range(void);
  extern int early_init_dt_scan_chosen_stdout(void);
  extern void early_init_fdt_scan_reserved_mem(void);
  extern void early_init_fdt_reserve_self(void);

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