Messages in this thread | | | Date | Tue, 27 Sep 2011 17:13:59 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the tip tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in drivers/iommu/dmar.c and include/linux/dmar.h between commit 318fe7df9d84 ("iommu: Move IOMMU specific code to intel-iommu.c") from the tip tree and commit 432fb2751763 ("When do pci remove/rescan on system that have more iommus, got") from the akpm tree.
The former moved that code the the latter cares about to another files. I have dropped this patch from the akpm tree for today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |