Hi all, Today's linux-next merge of the devicetree tree got a conflict in: arch/c6x/kernel/setup.c between commit: 31b02fe54206 ("c6x: switch to NO_BOOTMEM") from the c6x tree and commit: be7cd2df1d22 ("c6x: use common built-in dtb support") 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/c6x/kernel/setup.c index cc74cb9d349b,05d96a9541b5..000000000000 --- a/arch/c6x/kernel/setup.c +++ b/arch/c6x/kernel/setup.c @@@ -352,7 -348,17 +347,7 @@@ void __init setup_arch(char **cmdline_p init_mm.end_data = memory_start; init_mm.brk = memory_start; - unflatten_device_tree(); - /* - * Give all the memory to the bootmap allocator, tell it to put the - * boot mem_map at the start of memory - */ - bootmap_size = init_bootmem_node(NODE_DATA(0), - memory_start >> PAGE_SHIFT, - PAGE_OFFSET >> PAGE_SHIFT, - memory_end >> PAGE_SHIFT); - memblock_reserve(memory_start, bootmap_size); - + unflatten_and_copy_device_tree(); c6x_cache_init();
Attachment:
pgpAxebIhpv2W.pgp
Description: OpenPGP digital signature