linux-next: manual merge of the akpm-current tree with the powerpc tree

Stephen Rothwell
2019-02-25T06:16:15Z

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

Hi all,

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

arch/powerpc/kernel/setup_64.c

between commits:

c8e409a33cf8 ("powerpc/irq: use memblock functions returning virtual address")
d608898abc74 ("powerpc: clean stack pointers naming")

from the powerpc tree and commit:

82af77ee7503 ("powerpc: prefer memblock APIs returning virtual address")

from the akpm-current tree.

Commits 82af77ee7503 and c8e409a33cf8 overlap.

I fixed it up (I just used the powerpc tree version of this file) 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.