* linux-next: manual merge of the akpm-current tree with the dma-mapping tree
@ 2019-09-16 2:46 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2019-09-16 2:46 UTC (permalink / raw)
To: Andrew Morton, Christoph Hellwig, Matthew Wilcox
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 531 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/include/asm/xen/page-coherent.h
between commits:
bef4d2037d2143a ("xen/arm: consolidate page-coherent.h")
60d8cd572f655aa ("arm64/xen: fix xen-swiotlb cache flushing")
from the dma-mapping tree and commit:
46d5fa030cd9225 ("mm: introduce compound_nr()")
from the akpm-current tree. The former appear to make the latter
redundant so I resolved by dropping the relevant portions of the
commit from the akpm tree.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-09-16 2:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-16 2:46 linux-next: manual merge of the akpm-current tree with the dma-mapping tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox