Messages in this thread | | | Date | Mon, 9 Nov 2015 10:45:01 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pm tree with Linus' tree |
| |
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/pci/probe.c
between commit:
b07461a8e45b ("PCI/AER: Clear error status registers during enumeration and restore")
from Linus' tree and commit:
29dbe1f0af88 ("PCI: ACPI: Add support for PCI device DMA coherency")
from the pm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/pci/probe.c index f53b8e85f137,0dac52633f01..000000000000 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@@ -12,7 -13,7 +13,8 @@@ #include <linux/module.h> #include <linux/cpumask.h> #include <linux/pci-aspm.h> +#include <linux/aer.h> + #include <linux/acpi.h> #include <asm-generic/pci-bridge.h> #include "pci.h"
| |