[linux] 01/18: PCI: Enable PCIE_PTM (except on armel/marvell)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit f6ab8262195c809bc282c53e64f825e71a268a52
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Apr 25 22:20:09 2017 +0100

    PCI: Enable PCIE_PTM (except on armel/marvell)
---
 debian/changelog                   | 1 +
 debian/config/armel/config.marvell | 1 +
 debian/config/config               | 1 +
 3 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 489a854..fbe2b30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -332,6 +332,7 @@ linux (4.9.24-1) UNRELEASED; urgency=medium
     (CVE-2016-9604)
   * KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings
     (CVE-2017-7472)
+  * PCI: Enable PCIE_PTM (except on armel/marvell)
 
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 0dec457..e28bb1a 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -500,6 +500,7 @@ CONFIG_PCI_MVEBU=y
 ## file: drivers/pci/pcie/Kconfig
 ##
 # CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
 
 ##
 ## file: drivers/pcmcia/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 9fd68b5..36b975f 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3742,6 +3742,7 @@ CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
 
 ##
 ## file: drivers/pci/pcie/aer/Kconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git