Начало Каталог Помощ
Вход
GfA
/
linux_kernel
5
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

s390: update default configuration

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Martin Schwidefsky преди 11 години
родител
9b2efe035e
ревизия
e43b49a0cb
променени са 5 файла, в които са добавени 32 реда и са изтрити 74 реда
Разделен изглед Покажи статистика за разликите
  1. 14 22
      arch/s390/configs/default_defconfig
  2. 5 20
      arch/s390/configs/gcov_defconfig
  3. 9 21
      arch/s390/configs/performance_defconfig
  4. 2 8
      arch/s390/configs/zfcpdump_defconfig
  5. 2 3
      arch/s390/defconfig

+ 14 - 22
arch/s390/configs/default_defconfig
Целия файл 

@@ -35,7 +35,6 @@ CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODULE_FORCE_UNLOAD=y
 
 CONFIG_MODVERSIONS=y
 
 CONFIG_MODULE_SRCVERSION_ALL=y
 
-CONFIG_BLK_DEV_INTEGRITY=y
 
 CONFIG_BLK_DEV_THROTTLING=y
 
 CONFIG_PARTITION_ADVANCED=y
 
 CONFIG_IBM_PARTITION=y
 
@@ -245,6 +244,7 @@ CONFIG_NF_TABLES_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
+CONFIG_NF_NAT_IPV4=m
 
 CONFIG_IP_NF_IPTABLES=m
 
 CONFIG_IP_NF_MATCH_AH=m
 
 CONFIG_IP_NF_MATCH_ECN=m
 
@@ -252,11 +252,6 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
 
 CONFIG_IP_NF_MATCH_TTL=m
 
 CONFIG_IP_NF_FILTER=m
 
 CONFIG_IP_NF_TARGET_REJECT=m
 
-CONFIG_IP_NF_TARGET_ULOG=m
 
-CONFIG_NF_NAT_IPV4=m
 
-CONFIG_IP_NF_TARGET_MASQUERADE=m
 
-CONFIG_IP_NF_TARGET_NETMAP=m
 
-CONFIG_IP_NF_TARGET_REDIRECT=m
 
 CONFIG_IP_NF_MANGLE=m
 
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 
 CONFIG_IP_NF_TARGET_ECN=m
 
@@ -270,6 +265,7 @@ CONFIG_NF_CONNTRACK_IPV6=m
 
 CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
+CONFIG_NF_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
 CONFIG_IP6_NF_MATCH_AH=m
 
 CONFIG_IP6_NF_MATCH_EUI64=m
 
@@ -286,9 +282,6 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 
 CONFIG_IP6_NF_MANGLE=m
 
 CONFIG_IP6_NF_RAW=m
 
 CONFIG_IP6_NF_SECURITY=m
 
-CONFIG_NF_NAT_IPV6=m
 
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
 
-CONFIG_IP6_NF_TARGET_NPT=m
 
 CONFIG_NF_TABLES_BRIDGE=m
 
 CONFIG_NET_SCTPPROBE=m
 
 CONFIG_RDS=m
 
@@ -374,14 +367,13 @@ CONFIG_BLK_DEV_SR=m
 
 CONFIG_CHR_DEV_SG=y
 
 CONFIG_CHR_DEV_SCH=m
 
 CONFIG_SCSI_ENCLOSURE=m
 
-CONFIG_SCSI_MULTI_LUN=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_LOGGING=y
 
 CONFIG_SCSI_SPI_ATTRS=m
 
+CONFIG_SCSI_FC_ATTRS=y
 
 CONFIG_SCSI_SAS_LIBSAS=m
 
 CONFIG_SCSI_SRP_ATTRS=m
 
 CONFIG_ISCSI_TCP=m
 
-CONFIG_LIBFCOE=m
 
 CONFIG_SCSI_DEBUG=m
 
 CONFIG_ZFCP=y
 
 CONFIG_SCSI_VIRTIO=m
 
@@ -427,7 +419,6 @@ CONFIG_VIRTIO_NET=m
 
 CONFIG_NLMON=m
 
 CONFIG_VHOST_NET=m
 
 # CONFIG_NET_VENDOR_ARC is not set
 
-# CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_CHELSIO is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
@@ -481,14 +472,14 @@ CONFIG_JFS_FS=m
 
 CONFIG_JFS_POSIX_ACL=y
 
 CONFIG_JFS_SECURITY=y
 
 CONFIG_JFS_STATISTICS=y
 
-CONFIG_XFS_FS=m
 
+CONFIG_XFS_FS=y
 
 CONFIG_XFS_QUOTA=y
 
 CONFIG_XFS_POSIX_ACL=y
 
 CONFIG_XFS_RT=y
 
 CONFIG_XFS_DEBUG=y
 
 CONFIG_GFS2_FS=m
 
 CONFIG_OCFS2_FS=m
 
-CONFIG_BTRFS_FS=m
 
+CONFIG_BTRFS_FS=y
 
 CONFIG_BTRFS_FS_POSIX_ACL=y
 
 CONFIG_NILFS2_FS=m
 
 CONFIG_FANOTIFY=y
 
@@ -574,7 +565,6 @@ CONFIG_DEBUG_SHIRQ=y
 
 CONFIG_DETECT_HUNG_TASK=y
 
 CONFIG_TIMER_STATS=y
 
 CONFIG_DEBUG_RT_MUTEXES=y
 
-CONFIG_RT_MUTEX_TESTER=y
 
 CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
 
 CONFIG_PROVE_LOCKING=y
 
 CONFIG_LOCK_STAT=y
 
@@ -600,8 +590,13 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
 
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 
 CONFIG_LATENCYTOP=y
 
 CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
 
+CONFIG_IRQSOFF_TRACER=y
 
+CONFIG_PREEMPT_TRACER=y
 
+CONFIG_SCHED_TRACER=y
 
+CONFIG_FTRACE_SYSCALLS=y
 
+CONFIG_STACK_TRACER=y
 
 CONFIG_BLK_DEV_IO_TRACE=y
 
-# CONFIG_KPROBE_EVENT is not set
 
+CONFIG_UPROBE_EVENT=y
 
 CONFIG_LKDTM=m
 
 CONFIG_TEST_LIST_SORT=y
 
 CONFIG_KPROBES_SANITY_TEST=y
 
@@ -609,7 +604,10 @@ CONFIG_RBTREE_TEST=y
 
 CONFIG_INTERVAL_TREE_TEST=m
 
 CONFIG_PERCPU_TEST=m
 
 CONFIG_ATOMIC64_SELFTEST=y
 
+CONFIG_TEST_STRING_HELPERS=y
 
+CONFIG_TEST_KSTRTOX=y
 
 CONFIG_DMA_API_DEBUG=y
 
+CONFIG_TEST_BPF=m
 
 # CONFIG_STRICT_DEVMEM is not set
 
 CONFIG_S390_PTDUMP=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
@@ -673,12 +671,6 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 
 CONFIG_X509_CERTIFICATE_PARSER=m
 
 CONFIG_CRC7=m
 
 CONFIG_CRC8=m
 
-CONFIG_XZ_DEC_X86=y
 
-CONFIG_XZ_DEC_POWERPC=y
 
-CONFIG_XZ_DEC_IA64=y
 
-CONFIG_XZ_DEC_ARM=y
 
-CONFIG_XZ_DEC_ARMTHUMB=y
 
-CONFIG_XZ_DEC_SPARC=y
 
 CONFIG_CORDIC=m
 
 CONFIG_CMM=m
 
 CONFIG_APPLDATA_BASE=y

+ 5 - 20
arch/s390/configs/gcov_defconfig
Целия файл 

@@ -35,7 +35,6 @@ CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODULE_FORCE_UNLOAD=y
 
 CONFIG_MODVERSIONS=y
 
 CONFIG_MODULE_SRCVERSION_ALL=y
 
-CONFIG_BLK_DEV_INTEGRITY=y
 
 CONFIG_BLK_DEV_THROTTLING=y
 
 CONFIG_PARTITION_ADVANCED=y
 
 CONFIG_IBM_PARTITION=y
 
@@ -243,6 +242,7 @@ CONFIG_NF_TABLES_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
+CONFIG_NF_NAT_IPV4=m
 
 CONFIG_IP_NF_IPTABLES=m
 
 CONFIG_IP_NF_MATCH_AH=m
 
 CONFIG_IP_NF_MATCH_ECN=m
 
@@ -250,11 +250,6 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
 
 CONFIG_IP_NF_MATCH_TTL=m
 
 CONFIG_IP_NF_FILTER=m
 
 CONFIG_IP_NF_TARGET_REJECT=m
 
-CONFIG_IP_NF_TARGET_ULOG=m
 
-CONFIG_NF_NAT_IPV4=m
 
-CONFIG_IP_NF_TARGET_MASQUERADE=m
 
-CONFIG_IP_NF_TARGET_NETMAP=m
 
-CONFIG_IP_NF_TARGET_REDIRECT=m
 
 CONFIG_IP_NF_MANGLE=m
 
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 
 CONFIG_IP_NF_TARGET_ECN=m
 
@@ -268,6 +263,7 @@ CONFIG_NF_CONNTRACK_IPV6=m
 
 CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
+CONFIG_NF_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
 CONFIG_IP6_NF_MATCH_AH=m
 
 CONFIG_IP6_NF_MATCH_EUI64=m
 
@@ -284,9 +280,6 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 
 CONFIG_IP6_NF_MANGLE=m
 
 CONFIG_IP6_NF_RAW=m
 
 CONFIG_IP6_NF_SECURITY=m
 
-CONFIG_NF_NAT_IPV6=m
 
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
 
-CONFIG_IP6_NF_TARGET_NPT=m
 
 CONFIG_NF_TABLES_BRIDGE=m
 
 CONFIG_NET_SCTPPROBE=m
 
 CONFIG_RDS=m
 
@@ -371,14 +364,13 @@ CONFIG_BLK_DEV_SR=m
 
 CONFIG_CHR_DEV_SG=y
 
 CONFIG_CHR_DEV_SCH=m
 
 CONFIG_SCSI_ENCLOSURE=m
 
-CONFIG_SCSI_MULTI_LUN=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_LOGGING=y
 
 CONFIG_SCSI_SPI_ATTRS=m
 
+CONFIG_SCSI_FC_ATTRS=y
 
 CONFIG_SCSI_SAS_LIBSAS=m
 
 CONFIG_SCSI_SRP_ATTRS=m
 
 CONFIG_ISCSI_TCP=m
 
-CONFIG_LIBFCOE=m
 
 CONFIG_SCSI_DEBUG=m
 
 CONFIG_ZFCP=y
 
 CONFIG_SCSI_VIRTIO=m
 
@@ -424,7 +416,6 @@ CONFIG_VIRTIO_NET=m
 
 CONFIG_NLMON=m
 
 CONFIG_VHOST_NET=m
 
 # CONFIG_NET_VENDOR_ARC is not set
 
-# CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_CHELSIO is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
@@ -478,13 +469,13 @@ CONFIG_JFS_FS=m
 
 CONFIG_JFS_POSIX_ACL=y
 
 CONFIG_JFS_SECURITY=y
 
 CONFIG_JFS_STATISTICS=y
 
-CONFIG_XFS_FS=m
 
+CONFIG_XFS_FS=y
 
 CONFIG_XFS_QUOTA=y
 
 CONFIG_XFS_POSIX_ACL=y
 
 CONFIG_XFS_RT=y
 
 CONFIG_GFS2_FS=m
 
 CONFIG_OCFS2_FS=m
 
-CONFIG_BTRFS_FS=m
 
+CONFIG_BTRFS_FS=y
 
 CONFIG_BTRFS_FS_POSIX_ACL=y
 
 CONFIG_NILFS2_FS=m
 
 CONFIG_FANOTIFY=y
 
@@ -626,12 +617,6 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 
 CONFIG_X509_CERTIFICATE_PARSER=m
 
 CONFIG_CRC7=m
 
 CONFIG_CRC8=m
 
-CONFIG_XZ_DEC_X86=y
 
-CONFIG_XZ_DEC_POWERPC=y
 
-CONFIG_XZ_DEC_IA64=y
 
-CONFIG_XZ_DEC_ARM=y
 
-CONFIG_XZ_DEC_ARMTHUMB=y
 
-CONFIG_XZ_DEC_SPARC=y
 
 CONFIG_CORDIC=m
 
 CONFIG_CMM=m
 
 CONFIG_APPLDATA_BASE=y

+ 9 - 21
arch/s390/configs/performance_defconfig
Целия файл 

@@ -33,7 +33,6 @@ CONFIG_MODULE_UNLOAD=y
 
 CONFIG_MODULE_FORCE_UNLOAD=y
 
 CONFIG_MODVERSIONS=y
 
 CONFIG_MODULE_SRCVERSION_ALL=y
 
-CONFIG_BLK_DEV_INTEGRITY=y
 
 CONFIG_BLK_DEV_THROTTLING=y
 
 CONFIG_PARTITION_ADVANCED=y
 
 CONFIG_IBM_PARTITION=y
 
@@ -241,6 +240,7 @@ CONFIG_NF_TABLES_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
+CONFIG_NF_NAT_IPV4=m
 
 CONFIG_IP_NF_IPTABLES=m
 
 CONFIG_IP_NF_MATCH_AH=m
 
 CONFIG_IP_NF_MATCH_ECN=m
 
@@ -248,11 +248,6 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
 
 CONFIG_IP_NF_MATCH_TTL=m
 
 CONFIG_IP_NF_FILTER=m
 
 CONFIG_IP_NF_TARGET_REJECT=m
 
-CONFIG_IP_NF_TARGET_ULOG=m
 
-CONFIG_NF_NAT_IPV4=m
 
-CONFIG_IP_NF_TARGET_MASQUERADE=m
 
-CONFIG_IP_NF_TARGET_NETMAP=m
 
-CONFIG_IP_NF_TARGET_REDIRECT=m
 
 CONFIG_IP_NF_MANGLE=m
 
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 
 CONFIG_IP_NF_TARGET_ECN=m
 
@@ -266,6 +261,7 @@ CONFIG_NF_CONNTRACK_IPV6=m
 
 CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
+CONFIG_NF_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
 CONFIG_IP6_NF_MATCH_AH=m
 
 CONFIG_IP6_NF_MATCH_EUI64=m
 
@@ -282,9 +278,6 @@ CONFIG_IP6_NF_TARGET_REJECT=m
 
 CONFIG_IP6_NF_MANGLE=m
 
 CONFIG_IP6_NF_RAW=m
 
 CONFIG_IP6_NF_SECURITY=m
 
-CONFIG_NF_NAT_IPV6=m
 
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
 
-CONFIG_IP6_NF_TARGET_NPT=m
 
 CONFIG_NF_TABLES_BRIDGE=m
 
 CONFIG_NET_SCTPPROBE=m
 
 CONFIG_RDS=m
 
@@ -369,14 +362,13 @@ CONFIG_BLK_DEV_SR=m
 
 CONFIG_CHR_DEV_SG=y
 
 CONFIG_CHR_DEV_SCH=m
 
 CONFIG_SCSI_ENCLOSURE=m
 
-CONFIG_SCSI_MULTI_LUN=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_LOGGING=y
 
 CONFIG_SCSI_SPI_ATTRS=m
 
+CONFIG_SCSI_FC_ATTRS=y
 
 CONFIG_SCSI_SAS_LIBSAS=m
 
 CONFIG_SCSI_SRP_ATTRS=m
 
 CONFIG_ISCSI_TCP=m
 
-CONFIG_LIBFCOE=m
 
 CONFIG_SCSI_DEBUG=m
 
 CONFIG_ZFCP=y
 
 CONFIG_SCSI_VIRTIO=m
 
@@ -422,7 +414,6 @@ CONFIG_VIRTIO_NET=m
 
 CONFIG_NLMON=m
 
 CONFIG_VHOST_NET=m
 
 # CONFIG_NET_VENDOR_ARC is not set
 
-# CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_CHELSIO is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
@@ -476,13 +467,13 @@ CONFIG_JFS_FS=m
 
 CONFIG_JFS_POSIX_ACL=y
 
 CONFIG_JFS_SECURITY=y
 
 CONFIG_JFS_STATISTICS=y
 
-CONFIG_XFS_FS=m
 
+CONFIG_XFS_FS=y
 
 CONFIG_XFS_QUOTA=y
 
 CONFIG_XFS_POSIX_ACL=y
 
 CONFIG_XFS_RT=y
 
 CONFIG_GFS2_FS=m
 
 CONFIG_OCFS2_FS=m
 
-CONFIG_BTRFS_FS=m
 
+CONFIG_BTRFS_FS=y
 
 CONFIG_BTRFS_FS_POSIX_ACL=y
 
 CONFIG_NILFS2_FS=m
 
 CONFIG_FANOTIFY=y
 
@@ -550,8 +541,11 @@ CONFIG_TIMER_STATS=y
 
 CONFIG_RCU_TORTURE_TEST=m
 
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 
 CONFIG_LATENCYTOP=y
 
+CONFIG_SCHED_TRACER=y
 
+CONFIG_FTRACE_SYSCALLS=y
 
+CONFIG_STACK_TRACER=y
 
 CONFIG_BLK_DEV_IO_TRACE=y
 
-# CONFIG_KPROBE_EVENT is not set
 
+CONFIG_UPROBE_EVENT=y
 
 CONFIG_LKDTM=m
 
 CONFIG_PERCPU_TEST=m
 
 CONFIG_ATOMIC64_SELFTEST=y
 
@@ -618,12 +612,6 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 
 CONFIG_X509_CERTIFICATE_PARSER=m
 
 CONFIG_CRC7=m
 
 CONFIG_CRC8=m
 
-CONFIG_XZ_DEC_X86=y
 
-CONFIG_XZ_DEC_POWERPC=y
 
-CONFIG_XZ_DEC_IA64=y
 
-CONFIG_XZ_DEC_ARM=y
 
-CONFIG_XZ_DEC_ARMTHUMB=y
 
-CONFIG_XZ_DEC_SPARC=y
 
 CONFIG_CORDIC=m
 
 CONFIG_CMM=m
 
 CONFIG_APPLDATA_BASE=y

+ 2 - 8
arch/s390/configs/zfcpdump_defconfig
Целия файл 

@@ -22,8 +22,8 @@ CONFIG_HZ_100=y
 
 CONFIG_CRASH_DUMP=y
 
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 
 # CONFIG_SECCOMP is not set
 
-# CONFIG_IUCV is not set
 
 CONFIG_NET=y
 
+# CONFIG_IUCV is not set
 
 CONFIG_ATM=y
 
 CONFIG_ATM_LANE=y
 
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 
@@ -36,9 +36,9 @@ CONFIG_ENCLOSURE_SERVICES=y
 
 CONFIG_SCSI=y
 
 CONFIG_BLK_DEV_SD=y
 
 CONFIG_SCSI_ENCLOSURE=y
 
-CONFIG_SCSI_MULTI_LUN=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_LOGGING=y
 
+CONFIG_SCSI_FC_ATTRS=y
 
 CONFIG_SCSI_SRP_ATTRS=y
 
 CONFIG_ZFCP=y
 
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 
@@ -75,12 +75,6 @@ CONFIG_DEBUG_KERNEL=y
 
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 
 # CONFIG_FTRACE is not set
 
 # CONFIG_STRICT_DEVMEM is not set
 
-CONFIG_XZ_DEC_X86=y
 
-CONFIG_XZ_DEC_POWERPC=y
 
-CONFIG_XZ_DEC_IA64=y
 
-CONFIG_XZ_DEC_ARM=y
 
-CONFIG_XZ_DEC_ARMTHUMB=y
 
-CONFIG_XZ_DEC_SPARC=y
 
 # CONFIG_PFAULT is not set
 
 # CONFIG_S390_HYPFS_FS is not set
 
 # CONFIG_VIRTUALIZATION is not set

+ 2 - 3
arch/s390/defconfig
Целия файл 

@@ -92,10 +92,10 @@ CONFIG_CHR_DEV_ST=y
 
 CONFIG_BLK_DEV_SR=y
 
 CONFIG_BLK_DEV_SR_VENDOR=y
 
 CONFIG_CHR_DEV_SG=y
 
-CONFIG_SCSI_MULTI_LUN=y
 
 CONFIG_SCSI_CONSTANTS=y
 
 CONFIG_SCSI_LOGGING=y
 
 CONFIG_SCSI_SCAN_ASYNC=y
 
+CONFIG_SCSI_FC_ATTRS=y
 
 CONFIG_ZFCP=y
 
 CONFIG_SCSI_VIRTIO=y
 
 CONFIG_NETDEVICES=y
 
@@ -164,14 +164,13 @@ CONFIG_CRYPTO_CMAC=m
 
 CONFIG_CRYPTO_XCBC=m
 
 CONFIG_CRYPTO_VMAC=m
 
 CONFIG_CRYPTO_CRC32=m
 
-CONFIG_CRYPTO_CRCT10DIF=m
 
 CONFIG_CRYPTO_MD4=m
 
 CONFIG_CRYPTO_MICHAEL_MIC=m
 
 CONFIG_CRYPTO_RMD128=m
 
 CONFIG_CRYPTO_RMD160=m
 
 CONFIG_CRYPTO_RMD256=m
 
 CONFIG_CRYPTO_RMD320=m
 
-CONFIG_CRYPTO_SHA256=m
 
+CONFIG_CRYPTO_SHA256=y
 
 CONFIG_CRYPTO_SHA512=m
 
 CONFIG_CRYPTO_TGR192=m
 
 CONFIG_CRYPTO_WP512=m