diff --git a/configs/fedora/generic/CONFIG_RESET_ATTACK_MITIGATION b/configs/fedora/generic/CONFIG_RESET_ATTACK_MITIGATION index 8202a78..eea15dd 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 b6b959e..40204ff 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 b6e8e9a..2840487 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 71bc852..5f4cbea 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 d7640bb..691aa42 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 18e8cdf..66870f3 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 b93ab1a..25098a2 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 7e9c291..34127ec 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 88858c2..6483d79 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 9101143..f9838b3 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 1f62c5e..5066de5 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 8046de3..f2f963d 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 05f6532..38355fe 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 0d2f38e..d3bf8ca 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 49d8b7c..898e19e 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 ce9029a..b70bcca 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 6585ae5..91cfdba 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 a5ea275..dfccfed 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 83ab00e..a30c9a5 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 fbc41e2..1ef48a3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1891,6 +1891,9 @@ fi # # %changelog +* Mon Jan 08 2018 Laura Abbott +- Disable CONFIG_RESET_ATTACK_MITIGATION (rhbz 1532058) + * Mon Jan 08 2018 Justin M. Forbes - 4.15.0-0.rc7.git0.1 - First round of Speculative Execution variant 1 patches