diff options
| -rw-r--r-- | baseconfig/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/baseconfig/CONFIG_RESET_ATTACK_MITIGATION b/baseconfig/CONFIG_RESET_ATTACK_MITIGATION index 8202a7865..eea15dd52 100644 --- a/baseconfig/CONFIG_RESET_ATTACK_MITIGATION +++ b/baseconfig/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 fc9f75ce1..c381472f6 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4410,7 +4410,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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 f41d3ba9d..ff42b3e00 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4388,7 +4388,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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 7253b5e3a..5590ebaa8 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4748,7 +4748,7 @@ CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=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 089ed17f6..a0c27a913 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4456,7 +4456,7 @@ CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=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 cfe6e8fd7..98b8b22c7 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4434,7 +4434,7 @@ CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=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 7a00bb8ef..517871776 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4726,7 +4726,7 @@ CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=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 1ad654068..e97358bc7 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -4153,7 +4153,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index d3982d08b..8f1731c4d 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -4174,7 +4174,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index efb5c21f9..6153a6538 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4174,7 +4174,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-i686.config b/kernel-i686.config index 56c331cd2..435ea7fde 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4153,7 +4153,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 0ac9d2ea9..89d5614e9 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3985,7 +3985,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 11d229128..57c9c2dc0 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3962,7 +3962,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 0ddbf60bf..688b514ab 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3924,7 +3924,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index afc203092..d65e528e1 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3901,7 +3901,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index c4d5c0e41..9d4b47cf6 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3817,7 +3817,7 @@ CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=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 5ea771b84..6959ed2d0 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3794,7 +3794,7 @@ CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_REMOTEPROC=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 71fb4beb5..07efedd0e 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4217,7 +4217,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 3e850d33c..cf7d6fbf5 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4196,7 +4196,7 @@ CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=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_RFD_FTL is not set diff --git a/kernel.spec b/kernel.spec index 2e8ca7757..874c7eab3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2228,6 +2228,9 @@ fi # # %changelog +* Mon Jan 08 2018 Laura Abbott <labbott@redhat.com> +- Disable CONFIG_RESET_ATTACK_MITIGATION (rhbz 1532058) + * Fri Jan 05 2018 Laura Abbott <labbott@redhat.com> - Copy module linker script (rhbz 1531182) |