diff mbox series

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

Message ID 20200603185038.296b18ae@canb.auug.org.au (mailing list archive)
State Not Applicable
Headers show
Series linux-next: manual merge of the akpm-current tree with the powerpc tree | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/merge (4d8244d005b2a92c872a0a993c3aa94b5842e56b)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/next (4336b9337824a60a0b10013c622caeee99460db5)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch linus/master (d6f9469a03d832dcd17041ed67774ffb5f3e73b3)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/fixes (2f26ed1764b42a8c40d9c48441c73a70d805decf)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch linux-next (0e21d4620dd047da7952f44a2e1ac777ded2d57e)
snowpatch_ozlabs/apply_patch fail Failed to apply to any branch

Commit Message

Stephen Rothwell June 3, 2020, 8:50 a.m. UTC 
Hi all,

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

  arch/powerpc/mm/ptdump/ptdump.c

between commit:

  6b789a26d7da ("powerpc/ptdump: Handle hugepd at PGD level")

from the powerpc tree and patch:

  "powerpc: add support for folded p4d page tables"

from the akpm-current tree.

Thanks to Michael Ellerman for an example resolution.

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.
diff mbox series

Patch

diff --cc arch/powerpc/mm/ptdump/ptdump.c
index 5fc880e30175,507cb9793b26..000000000000
--- a/arch/powerpc/mm/ptdump/ptdump.c