diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-05-25 11:13:52 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-05-25 11:13:52 -0400 |
| commit | 42d2805cbe603c4665670101f6a676eb0dd07abe (patch) | |
| tree | f90742b1e7e5aea36e869f408e598db0d0bb9928 /config-s390x | |
| parent | cfaea7dc727cbea3f1150d2f8e9749a167519e32 (diff) | |
| download | kernel-42d2805cbe603c4665670101f6a676eb0dd07abe.tar.gz kernel-42d2805cbe603c4665670101f6a676eb0dd07abe.tar.xz kernel-42d2805cbe603c4665670101f6a676eb0dd07abe.zip | |
Linux v4.6-10203-g84787c572d40
- Enable CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE (rhbz 1339281)
- Fixup SB patchset to work with upstream changes
Diffstat (limited to 'config-s390x')
| -rw-r--r-- | config-s390x | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-s390x b/config-s390x index e6e2f85a9..d559c6570 100644 --- a/config-s390x +++ b/config-s390x @@ -183,7 +183,7 @@ CONFIG_VIRTIO_CONSOLE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y -# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_CHSC_SCH=m # drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now" |