From 8a25902a331339da36e1c280a3d5a8a8c2fbd865 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 4 Sep 2015 10:28:36 -0400 Subject: Linux v4.2-6663-g807249d3ada1 --- config-generic | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config-generic') diff --git a/config-generic b/config-generic index 35b54d818..243263547 100644 --- a/config-generic +++ b/config-generic @@ -51,6 +51,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_FUTEX=y +# CONFIG_FAIL_FUTEX is not set CONFIG_EPOLL=y CONFIG_BPF_SYSCALL=y CONFIG_IOSCHED_NOOP=y @@ -4307,7 +4308,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=y -CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_ENCRYPTION is not set @@ -4643,6 +4644,7 @@ CONFIG_HEADERS_CHECK=y # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set # CONFIG_DEBUG_LOCKDEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_STATIC_KEYS_SELFTEST is not set # DEBUG options that don't get enabled/disabled with 'make debug/release' @@ -5605,6 +5607,7 @@ CONFIG_PSTORE_RAM=m # CONFIG_MEMTEST is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_RHASHTABLE is not set +# CONFIG_TEST_STATIC_KEYS is not set # CONFIG_AVERAGE is not set # CONFIG_VMXNET3 is not set -- cgit