diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-01-09 08:22:48 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-01-09 08:22:48 +0100 |
| commit | 6c9d602a8ee2ec59d3966c82b50befbb57a151c9 (patch) | |
| tree | 200aa3a344a58f50cee6a8034da6bfec98d5d845 /kernel-x86_64.config | |
| parent | ee38f3d411cdc2b82225f474bbf9c5ddf078a222 (diff) | |
| parent | e3ed9bf70ddd6db6b12b4a002a3dfdbe97f632b3 (diff) | |
| download | kernel-6c9d602a8ee2ec59d3966c82b50befbb57a151c9.tar.gz kernel-6c9d602a8ee2ec59d3966c82b50befbb57a151c9.tar.xz kernel-6c9d602a8ee2ec59d3966c82b50befbb57a151c9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc7.git0.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc7.git0.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc7.git0.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 2 |
1 files changed, 1 insertions, 1 deletions
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 |