Version bump/sync with core repo

1 files changed, 0 insertions, 32 deletions

diff --git a/RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch b/RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
deleted file mode 100644
index c43bc4bc131f..000000000000
--- a/RFC-v2-PCI-Workaround-to-enable-poweroff-on-Mac-Pro-11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 37ff015..47b303a 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -2776,6 +2776,27 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
- 
- /*
-+ * Apple: Avoid programming the memory/io aperture of 00:1c.0
-+ *
-+ * BIOS does not declare any resource for 00:1c.0, but with
-+ * hotplug flag set, thus OS allocate:
-+ * [mem 0x7fa00000 - 0x7fbfffff]
-+ * [mem 0x7fc00000-0x7fdfffff 64bit pref]
-+ * which is conflict with an unreported device, which
-+ * causes unpredictable result such as accessing io port.
-+ * So clear the hotplug flag to work around it.
-+ */
-+static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
-+{
-+	if (dmi_match(DMI_BOARD_VENDOR, "Apple Inc.") &&
-+	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
-+	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5"))
-+		dev->is_hotplug_bridge = 0;
-+}
-+
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);
-+
-+/*
-  * This is a quirk for the Ricoh MMC controller found as a part of
-  * some mulifunction chips.
-