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:
signature.asc
Description: PGP signature
