Hi Ingo,
Today's linux-next merge of the iommu tree got a conflict in
lib/swiotlb.c between commit 52942b6b16c6ebb25f4dd4df0208d840ba0cbc5c
("swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c") from
the tip-core tree and commit fb05a37929e0cd99016b4f5e5a5ef077fb10a947
("swiotlb: add support for systems with highmem") from the iommu tree.
Just trivial overlapping add/removal of header includes. I fixed it up
and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpaOfqgKQsbC.pgp
Description: PGP signature
