Hi all,
Today's linux-next merge of the memblock tree got a conflict in:
mm/mm_init.c
between commits:
dcd8c5e5603d ("mm/mm_init.c: use deferred_init_mem_pfn_range_in_zone() to decide loop condition")
c6586af1f388 ("mm/mm_init.c: not always search next deferred_init_pfn from very beginning")
from the mm-unstable branch of the mm tree and commit:
731b11684819 ("mm/mm_init.c: use deferred_init_mem_pfn_range_in_zone() to decide loop condition")
from the memblock tree.
I fixed it up (I used the former version) 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