diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
commit | 6a50f368784f29b0772f265a05b9e395bb2c23ff (patch) | |
tree | 80faccf654cbbaae2a0a74686db514f663623bb2 /config-s390x | |
parent | 498236e304bc3f3c936ef937b2a101b9e22f6544 (diff) | |
download | kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.gz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.xz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.zip |
Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143)
- Fix errant with_perf disable that removed perf entirely (rhbz 1237266)
Diffstat (limited to 'config-s390x')
-rw-r--r-- | config-s390x | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config-s390x b/config-s390x index ec433936d..ae529e443 100644 --- a/config-s390x +++ b/config-s390x @@ -217,7 +217,6 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y CONFIG_PCI=y CONFIG_PCI_NR_FUNCTIONS=64 CONFIG_PCI_NR_MSI=256 -CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_SHPC=y CONFIG_HOTPLUG_PCI_S390=y |