diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
| commit | 20afbe1cdd218f149a773c01945893c353fa2c60 (patch) | |
| tree | 0e0526ab848c717a7971728347f62a81d1ca9a1b /kernel-s390x.config | |
| parent | 93bf93308b5aad49a6575406966b3ab2047e14d3 (diff) | |
| parent | a54055adb14a40ada848c9ef6677cecbc58939e2 (diff) | |
| download | kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc27.tar.gz kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc27.tar.xz kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc27.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index be6e6c954..5d70d5e5b 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1363,6 +1363,7 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m +# CONFIG_EROFS_FS is not set CONFIG_ET131X=m CONFIG_ETHERNET=y # CONFIG_ETHOC is not set @@ -1371,9 +1372,8 @@ CONFIG_ETHERNET=y # CONFIG_EXOFS_DEBUG is not set # CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_AUTO is not set -CONFIG_EXPOLINE_FULL=y -CONFIG_EXPOLINE_MEDIUM=y +CONFIG_EXPOLINE_AUTO=y +# CONFIG_EXPOLINE_FULL is not set # CONFIG_EXPOLINE_OFF is not set CONFIG_EXPOLINE=y CONFIG_EXPORTFS=y @@ -2463,7 +2463,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZ4 is not set # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_NOBP=y +# CONFIG_KERNEL_NOBP is not set # CONFIG_KERNEL_UNCOMPRESSED is not set # CONFIG_KERNEL_XZ is not set CONFIG_KEXEC_FILE=y |