| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20151109104501.348445c7@canb.auug.org.au>
Date: Mon, 9 Nov 2015 10:45:01 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Taku Izumi <izumi.taku@...fujitsu.com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
"Suthikulpanit, Suravee" <Suravee.Suthikulpanit@....com>
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@...b.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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists