Hi all,
Today's linux-next merge of the x86 tree got a conflict in
drivers/pci/intel-iommu.c between commit
213f841f903ed16fc1dd29885560cdd159630ed6 ("intel-iommu.c: Blacklist Intel
DG33BU motherboard") from the dwmw2 tree and commit
2ae21010694e56461a63bfc80e960090ce0a5ed9 ("x64, x2apic/intr-remap:
Interrupt remapping infrastructure") from the x86 tree.
I think the easiest thing to do for today is just to revert the change in
the dwmw2 tree and see if you guys can come up with a better patch for
tomorrow.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpI994TG19Jr.pgp
Description: PGP signature
