From 2c4dd3172155d1dc8514b0c78ac4bc17b2d567e7 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Jan 08 2018 22:41:35 +0000 Subject: Disable CONFIG_RESET_ATTACK_MITIGATION (rhbz 1532058) --- diff --git a/baseconfig/CONFIG_RESET_ATTACK_MITIGATION b/baseconfig/CONFIG_RESET_ATTACK_MITIGATION index 8202a78..eea15dd 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 81ea6bf..02f5f79 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4411,7 +4411,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 46707fd..a2ccf01 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4389,7 +4389,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 da4e236..4e01ac4 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4752,7 +4752,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 28a7782..1afeb94 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4460,7 +4460,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 39151a7..4f6102b 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4438,7 +4438,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 3409c2d..47c1264 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4730,7 +4730,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 2e81c25..e4191b1 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -4154,7 +4154,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 52548aa..cbdfd27 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -4175,7 +4175,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 2e9d192..6445aa2 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4175,7 +4175,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 b007296..414eca5 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4154,7 +4154,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 b021e38..d26f38b 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3988,7 +3988,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 872742a..c981069 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3965,7 +3965,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 037b534..6ffb044 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3927,7 +3927,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 8883ffc..b1b5730 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3904,7 +3904,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 11ca3e3..ddf9327 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3820,7 +3820,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 0abe270..d7b1ab5 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3797,7 +3797,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 9ca5d90..0ee7f83 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4218,7 +4218,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 7ce1dc7..73abee4 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4197,7 +4197,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 c47f3e4..b094526 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2237,6 +2237,9 @@ fi # # %changelog +* Mon Jan 08 2018 Laura Abbott +- Disable CONFIG_RESET_ATTACK_MITIGATION (rhbz 1532058) + * Fri Jan 05 2018 Laura Abbott - Copy module linker script (rhbz 1531182)