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-x86-generic | |
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-x86-generic')
-rw-r--r-- | config-x86-generic | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic index 785d27123..862855664 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -130,11 +130,9 @@ CONFIG_GENERIC_ISA_DMA=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_BIOS=y -CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m -# CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y |