summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2017-04-04 10:51:11 -0500
committerJustin M. Forbes <jforbes@redhat.com>2017-04-04 10:51:11 -0500
commit85f80332e48ee6176a517098d86bc2b0b50c803a (patch)
tree7779db9866bef61419c664bb8ac5f2dba5ed7b6b
parent06b389b176656aff3c40f2c239042dab475469ce (diff)
downloadkernel-85f80332e48ee6176a517098d86bc2b0b50c803a.tar.gz
kernel-85f80332e48ee6176a517098d86bc2b0b50c803a.tar.xz
kernel-85f80332e48ee6176a517098d86bc2b0b50c803a.zip
redisable CONFIG_IWLWIFI_PCIE_RTPM (rhbz 1429135)
-rw-r--r--baseconfig/CONFIG_IWLWIFI_PCIE_RTPM2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-ppc64p7-debug.config2
-rw-r--r--kernel-ppc64p7.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec3
22 files changed, 24 insertions, 21 deletions
diff --git a/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM b/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM
index b3f9fbf18..4e3c83368 100644
--- a/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM
+++ b/baseconfig/CONFIG_IWLWIFI_PCIE_RTPM
@@ -1 +1 @@
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 47d3cc6a1..c1f3fb141 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2426,7 +2426,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
# CONFIG_IWMMXT is not set
CONFIG_IXGBE_DCA=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 6144050b9..ab6cfc81b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2409,7 +2409,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
# CONFIG_IWMMXT is not set
CONFIG_IXGBE_DCA=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 40c48fd97..9601bcf08 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2606,7 +2606,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IWMMXT=y
CONFIG_IXGBE_DCA=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index bf34c8ac6..8218a22d2 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2494,7 +2494,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IWMMXT=y
CONFIG_IXGBE_DCA=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 77a31c78e..f072dc8cc 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2478,7 +2478,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IWMMXT=y
CONFIG_IXGBE_DCA=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 2f2f90f60..16c9377c8 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2590,7 +2590,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IWMMXT=y
CONFIG_IXGBE_DCA=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 119c28192..f25ded802 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2348,7 +2348,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index c8b90a377..c3daa6f5a 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2365,7 +2365,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index bcd8b4c3a..2846279bc 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2365,7 +2365,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-i686.config b/kernel-i686.config
index a22ab7695..1aaf0f5f6 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2348,7 +2348,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 6b584ae99..5b76b3fb9 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2249,7 +2249,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index ae49e786d..8a6f64615 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2232,7 +2232,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 4a31b7cba..8e29fb220 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2195,7 +2195,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 10596a11e..9b843facf 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2178,7 +2178,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 4b6793b73..8863df2bb 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -2194,7 +2194,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 4b6ac4b67..3f5f50a16 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -2177,7 +2177,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 2a5eafdf0..44ccdebc7 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2144,7 +2144,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index ec33d33cc..2c5e35a3f 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2127,7 +2127,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index ab4c6fb72..1a7b4ec79 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2401,7 +2401,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index cbafbf63f..342ae2c01 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2384,7 +2384,7 @@ CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_PCIE_RTPM=y
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
# CONFIG_IWM is not set
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
diff --git a/kernel.spec b/kernel.spec
index e1b78d17a..f02aa1812 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2180,6 +2180,9 @@ fi
#
#
%changelog
+* Tue Apr 04 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- redisable CONFIG_IWLWIFI_PCIE_RTPM (rhbz 1429135)
+
* Fri Mar 31 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.8-200
- Linux v4.10.8