Re: linux-next: manual merge of the dt-rh tree with the powerpc tree

2013-11-01 Thread Rob Herring 
On 11/01/2013 12:20 AM, Stephen Rothwell wrote:
 Hi Rob,
 
 Today's linux-next merge of the dt-rh tree got a conflict in 
 arch/powerpc/include/asm/prom.h between commit a3e31b458844 (of:
 Move definition of of_find_next_cache_node into common code) from
 the powerpc tree and commit 0c3f061c195c (of: implement
 of_node_to_nid as a weak function) from the dt-rh tree.

Ben, I can pick these 2 patches up instead if you want to drop them
and avoid the conflict.

Rob

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: linux-next: manual merge of the dt-rh tree with the powerpc tree

2013-11-01 Thread Stephen Rothwell 
Hi Rob,

On Fri, 01 Nov 2013 17:24:42 -0500 Rob Herring robherri...@gmail.com wrote:

 On 11/01/2013 12:20 AM, Stephen Rothwell wrote:
  
  Today's linux-next merge of the dt-rh tree got a conflict in 
  arch/powerpc/include/asm/prom.h between commit a3e31b458844 (of:
  Move definition of of_find_next_cache_node into common code) from
  the powerpc tree and commit 0c3f061c195c (of: implement
  of_node_to_nid as a weak function) from the dt-rh tree.
 
 Ben, I can pick these 2 patches up instead if you want to drop them
 and avoid the conflict.

The conflict is pretty trivial and so should not require any action.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpNqd1VdHul4.pgp
Description: PGP signature
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: linux-next: manual merge of the dt-rh tree with the powerpc tree

2013-11-01 Thread Benjamin Herrenschmidt 
On Fri, 2013-11-01 at 17:24 -0500, Rob Herring wrote:
 On 11/01/2013 12:20 AM, Stephen Rothwell wrote:
  Hi Rob,
  
  Today's linux-next merge of the dt-rh tree got a conflict in 
  arch/powerpc/include/asm/prom.h between commit a3e31b458844 (of:
  Move definition of of_find_next_cache_node into common code) from
  the powerpc tree and commit 0c3f061c195c (of: implement
  of_node_to_nid as a weak function) from the dt-rh tree.
 
 Ben, I can pick these 2 patches up instead if you want to drop them
 and avoid the conflict.

I'd rather not rebase my tree, the conflict seems to be rather trivial
to solve.

Cheers,
Ben.


___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

linux-next: manual merge of the dt-rh tree with the powerpc tree

2013-10-31 Thread Stephen Rothwell 
Hi Rob,

Today's linux-next merge of the dt-rh tree got a conflict in
arch/powerpc/include/asm/prom.h between commit a3e31b458844 (of: Move
definition of of_find_next_cache_node into common code) from the powerpc
tree and commit 0c3f061c195c (of: implement of_node_to_nid as a weak
function) from the dt-rh tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/powerpc/include/asm/prom.h
index bf09e5a065b8,7687f82a3217..
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@@ -44,13 -39,9 +39,6 @@@ void of_parse_dma_window(struct device_
  
  extern void kdump_move_device_tree(void);
  
- #ifdef CONFIG_NUMA
- extern int of_node_to_nid(struct device_node *device);
- #else
- static inline int of_node_to_nid(struct device_node *device) { return 0; }
- #endif
- #define of_node_to_nid of_node_to_nid
 -/* cache lookup */
 -struct device_node *of_find_next_cache_node(struct device_node *np);
--
  extern void of_instantiate_rtc(void);
  
  extern int of_get_ibm_chip_id(struct device_node *np);


pgpWv4h0HrExv.pgp
Description: PGP signature
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev