Commit 840bc67c authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: Update defconfigs 



Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 0fd20f65

arch/s390/configs/debug_defconfig

+9 −5
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ CONFIG_SLUB_STATS=y 
CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_PERSISTENT_HUGE_ZERO_FOLIO=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CMA_DEBUGFS=y

CONFIG_CMA_SYSFS=y
@@ -123,12 +124,12 @@ CONFIG_TLS_DEVICE=y 
CONFIG_TLS_TOE=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_DIBS=y

CONFIG_DIBS_LO=y

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_DIBS=y

CONFIG_DIBS_LO=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -472,6 +473,7 @@ CONFIG_SCSI_DH_EMC=m 
CONFIG_SCSI_DH_ALUA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LLBITMAP=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_CLUSTER=m
@@ -654,9 +656,12 @@ CONFIG_JFS_POSIX_ACL=y 
CONFIG_JFS_SECURITY=y

CONFIG_JFS_STATISTICS=y

CONFIG_XFS_FS=y

CONFIG_XFS_SUPPORT_V4=y

CONFIG_XFS_SUPPORT_ASCII_CI=y

CONFIG_XFS_QUOTA=y

CONFIG_XFS_POSIX_ACL=y

CONFIG_XFS_RT=y

# CONFIG_XFS_ONLINE_SCRUB is not set

CONFIG_XFS_DEBUG=y

CONFIG_GFS2_FS=m

CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -666,7 +671,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y 
CONFIG_BTRFS_DEBUG=y

CONFIG_BTRFS_ASSERT=y

CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y

arch/s390/configs/defconfig

+9 −5
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ CONFIG_SLAB_BUCKETS=y 
CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_PERSISTENT_HUGE_ZERO_FOLIO=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CMA_SYSFS=y

CONFIG_CMA_AREAS=7
@@ -114,12 +115,12 @@ CONFIG_TLS_DEVICE=y 
CONFIG_TLS_TOE=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_DIBS=y

CONFIG_DIBS_LO=y

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_DIBS=y

CONFIG_DIBS_LO=y

CONFIG_XDP_SOCKETS=y

CONFIG_XDP_SOCKETS_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -462,6 +463,7 @@ CONFIG_SCSI_DH_EMC=m 
CONFIG_SCSI_DH_ALUA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LLBITMAP=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_CLUSTER=m
@@ -644,16 +646,18 @@ CONFIG_JFS_POSIX_ACL=y 
CONFIG_JFS_SECURITY=y

CONFIG_JFS_STATISTICS=y

CONFIG_XFS_FS=y

CONFIG_XFS_SUPPORT_V4=y

CONFIG_XFS_SUPPORT_ASCII_CI=y

CONFIG_XFS_QUOTA=y

CONFIG_XFS_POSIX_ACL=y

CONFIG_XFS_RT=y

# CONFIG_XFS_ONLINE_SCRUB is not set

CONFIG_GFS2_FS=m

CONFIG_GFS2_FS_LOCKING_DLM=y

CONFIG_OCFS2_FS=m

CONFIG_BTRFS_FS=y

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y

arch/s390/configs/zfcpdump_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ CONFIG_NET=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_SAFE=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_DCSSBLK is not set

# CONFIG_DASD is not set

CONFIG_ENCLOSURE_SERVICES=y

CONFIG_SCSI=y