linux-next: manual merge of the pm tree with Linus' tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the pm tree with Linus' tree
Date	2015-11-09 00:50 +0100
Message-ID	<qsHSG-6T7-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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"
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the pm tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-09 00:50 +0100

csiph-web