diff options
| -rw-r--r-- | configs/fedora/generic/CONFIG_RESET_ATTACK_MITIGATION | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 2 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 2 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 2 | ||||
| -rw-r--r-- | kernel-i686.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 2 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
| -rw-r--r-- | kernel-s390x.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
20 files changed, 22 insertions, 19 deletions
diff --git a/configs/fedora/generic/CONFIG_RESET_ATTACK_MITIGATION b/configs/fedora/generic/CONFIG_RESET_ATTACK_MITIGATION index 8202a7865..eea15dd52 100644 --- a/configs/fedora/generic/CONFIG_RESET_ATTACK_MITIGATION +++ b/configs/fedora/generic/CONFIG_RESET_ATTACK_MITIGATION @@ -1 +1 @@ -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index b6b959ea1..40204ff8d 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4450,7 +4450,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=y CONFIG_RESET_HISI=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index b6e8e9aa2..284048721 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4428,7 +4428,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=y CONFIG_RESET_HISI=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 71bc8524b..5f4cbea2d 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4785,7 +4785,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=y # CONFIG_RESET_HSDK_V1 is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index d7640bb34..691aa4285 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4493,7 +4493,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=y # CONFIG_RESET_HSDK_V1 is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 18e8cdfd9..66870f31a 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4471,7 +4471,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=y # CONFIG_RESET_HSDK_V1 is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index b93ab1aff..25098a266 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4763,7 +4763,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=y # CONFIG_RESET_HSDK_V1 is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 7e9c291da..34127ec22 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -4181,7 +4181,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 88858c245..6483d7993 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -4202,7 +4202,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 91011430f..f9838b329 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4202,7 +4202,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-i686.config b/kernel-i686.config index 1f62c5ef6..5066de5f7 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4181,7 +4181,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 8046de3ff..f2f963dc1 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -4010,7 +4010,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 05f6532ed..38355fe12 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3987,7 +3987,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 0d2f38e3a..d3bf8ca29 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3949,7 +3949,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 49d8b7c00..898e19e20 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3926,7 +3926,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index ce9029aae..b70bcca3d 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3841,7 +3841,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 6585ae530..91cfdbade 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3818,7 +3818,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index a5ea275f3..dfccfed98 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4280,7 +4280,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 83ab00e9a..a30c9a5bc 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4259,7 +4259,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m -CONFIG_RESET_ATTACK_MITIGATION=y +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_HSDK_V1 is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RFD77402 is not set diff --git a/kernel.spec b/kernel.spec index fbc41e28a..1ef48a39e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1891,6 +1891,9 @@ fi # # %changelog +* Mon Jan 08 2018 Laura Abbott <labbott@redhat.com> +- Disable CONFIG_RESET_ATTACK_MITIGATION (rhbz 1532058) + * Mon Jan 08 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.15.0-0.rc7.git0.1 - First round of Speculative Execution variant 1 patches |