| Message ID | 20190708214328.6271f3f2@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 |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch next (c1774fe4ca71f894bbf1ef92ad928d72775c7b29) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
diff --cc arch/powerpc/include/asm/pgtable.h index bf7d771f342e,64145751b2fd..000000000000 --- a/arch/powerpc/include/asm/pgtable.h
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/include/asm/pgtable.h between commit: d6eacedd1f0e ("powerpc/book3s: Use config independent helpers for page table walk") from the powerpc tree and commit: be66a174b253 ("mm/nvdimm: add is_ioremap_addr and use that to check ioremap address") from the akpm-current 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.