Skip to content

Commit 840bc67

Browse files
committed
s390: Update defconfigs
Signed-off-by: Heiko Carstens <[email protected]>
1 parent 0fd20f6 commit 840bc67

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ CONFIG_SLUB_STATS=y
101101
CONFIG_MEMORY_HOTPLUG=y
102102
CONFIG_MEMORY_HOTREMOVE=y
103103
CONFIG_KSM=y
104+
CONFIG_PERSISTENT_HUGE_ZERO_FOLIO=y
104105
CONFIG_TRANSPARENT_HUGEPAGE=y
105106
CONFIG_CMA_DEBUGFS=y
106107
CONFIG_CMA_SYSFS=y
@@ -123,12 +124,12 @@ CONFIG_TLS_DEVICE=y
123124
CONFIG_TLS_TOE=y
124125
CONFIG_XFRM_USER=m
125126
CONFIG_NET_KEY=m
126-
CONFIG_XDP_SOCKETS=y
127-
CONFIG_XDP_SOCKETS_DIAG=m
128-
CONFIG_DIBS=y
129-
CONFIG_DIBS_LO=y
130127
CONFIG_SMC=m
131128
CONFIG_SMC_DIAG=m
129+
CONFIG_DIBS=y
130+
CONFIG_DIBS_LO=y
131+
CONFIG_XDP_SOCKETS=y
132+
CONFIG_XDP_SOCKETS_DIAG=m
132133
CONFIG_INET=y
133134
CONFIG_IP_MULTICAST=y
134135
CONFIG_IP_ADVANCED_ROUTER=y
@@ -472,6 +473,7 @@ CONFIG_SCSI_DH_EMC=m
472473
CONFIG_SCSI_DH_ALUA=m
473474
CONFIG_MD=y
474475
CONFIG_BLK_DEV_MD=y
476+
CONFIG_MD_LLBITMAP=y
475477
# CONFIG_MD_BITMAP_FILE is not set
476478
CONFIG_MD_LINEAR=m
477479
CONFIG_MD_CLUSTER=m
@@ -654,9 +656,12 @@ CONFIG_JFS_POSIX_ACL=y
654656
CONFIG_JFS_SECURITY=y
655657
CONFIG_JFS_STATISTICS=y
656658
CONFIG_XFS_FS=y
659+
CONFIG_XFS_SUPPORT_V4=y
660+
CONFIG_XFS_SUPPORT_ASCII_CI=y
657661
CONFIG_XFS_QUOTA=y
658662
CONFIG_XFS_POSIX_ACL=y
659663
CONFIG_XFS_RT=y
664+
# CONFIG_XFS_ONLINE_SCRUB is not set
660665
CONFIG_XFS_DEBUG=y
661666
CONFIG_GFS2_FS=m
662667
CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -666,7 +671,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
666671
CONFIG_BTRFS_DEBUG=y
667672
CONFIG_BTRFS_ASSERT=y
668673
CONFIG_NILFS2_FS=m
669-
CONFIG_FS_DAX=y
670674
CONFIG_EXPORTFS_BLOCK_OPS=y
671675
CONFIG_FS_ENCRYPTION=y
672676
CONFIG_FS_VERITY=y

arch/s390/configs/defconfig

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ CONFIG_SLAB_BUCKETS=y
9494
CONFIG_MEMORY_HOTPLUG=y
9595
CONFIG_MEMORY_HOTREMOVE=y
9696
CONFIG_KSM=y
97+
CONFIG_PERSISTENT_HUGE_ZERO_FOLIO=y
9798
CONFIG_TRANSPARENT_HUGEPAGE=y
9899
CONFIG_CMA_SYSFS=y
99100
CONFIG_CMA_AREAS=7
@@ -114,12 +115,12 @@ CONFIG_TLS_DEVICE=y
114115
CONFIG_TLS_TOE=y
115116
CONFIG_XFRM_USER=m
116117
CONFIG_NET_KEY=m
117-
CONFIG_XDP_SOCKETS=y
118-
CONFIG_XDP_SOCKETS_DIAG=m
119-
CONFIG_DIBS=y
120-
CONFIG_DIBS_LO=y
121118
CONFIG_SMC=m
122119
CONFIG_SMC_DIAG=m
120+
CONFIG_DIBS=y
121+
CONFIG_DIBS_LO=y
122+
CONFIG_XDP_SOCKETS=y
123+
CONFIG_XDP_SOCKETS_DIAG=m
123124
CONFIG_INET=y
124125
CONFIG_IP_MULTICAST=y
125126
CONFIG_IP_ADVANCED_ROUTER=y
@@ -462,6 +463,7 @@ CONFIG_SCSI_DH_EMC=m
462463
CONFIG_SCSI_DH_ALUA=m
463464
CONFIG_MD=y
464465
CONFIG_BLK_DEV_MD=y
466+
CONFIG_MD_LLBITMAP=y
465467
# CONFIG_MD_BITMAP_FILE is not set
466468
CONFIG_MD_LINEAR=m
467469
CONFIG_MD_CLUSTER=m
@@ -644,16 +646,18 @@ CONFIG_JFS_POSIX_ACL=y
644646
CONFIG_JFS_SECURITY=y
645647
CONFIG_JFS_STATISTICS=y
646648
CONFIG_XFS_FS=y
649+
CONFIG_XFS_SUPPORT_V4=y
650+
CONFIG_XFS_SUPPORT_ASCII_CI=y
647651
CONFIG_XFS_QUOTA=y
648652
CONFIG_XFS_POSIX_ACL=y
649653
CONFIG_XFS_RT=y
654+
# CONFIG_XFS_ONLINE_SCRUB is not set
650655
CONFIG_GFS2_FS=m
651656
CONFIG_GFS2_FS_LOCKING_DLM=y
652657
CONFIG_OCFS2_FS=m
653658
CONFIG_BTRFS_FS=y
654659
CONFIG_BTRFS_FS_POSIX_ACL=y
655660
CONFIG_NILFS2_FS=m
656-
CONFIG_FS_DAX=y
657661
CONFIG_EXPORTFS_BLOCK_OPS=y
658662
CONFIG_FS_ENCRYPTION=y
659663
CONFIG_FS_VERITY=y

arch/s390/configs/zfcpdump_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ CONFIG_NET=y
3333
CONFIG_DEVTMPFS=y
3434
CONFIG_DEVTMPFS_SAFE=y
3535
CONFIG_BLK_DEV_RAM=y
36-
# CONFIG_DCSSBLK is not set
3736
# CONFIG_DASD is not set
3837
CONFIG_ENCLOSURE_SERVICES=y
3938
CONFIG_SCSI=y

0 commit comments

Comments
 (0)