Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/mm/dma-mapping.c
drivers/iommu/intel-iommu.c
drivers/staging/android/ion/ion_chunk_heap.c
between commit:
3e6110fd5480 ("Revert "scatterlist: use sg_phys()"")
from Linus' tree and commit:
0504b8687491 ("scatterlist: fix sg_phys() masking")
from the akpm-current tree.
I fixed it up (I use the Linus' tree version for now, effectively removing
the whole of the akpm-current tree patch) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
