Skip to content

Commit 3d940bb

Browse files
hcahcaAlexander Gordeev
authored andcommitted
s390: update defconfigs
Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]>
1 parent e6b2dab commit 3d940bb

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ CONFIG_KEXEC_FILE=y
4444
CONFIG_KEXEC_SIG=y
4545
CONFIG_CRASH_DUMP=y
4646
CONFIG_LIVEPATCH=y
47-
CONFIG_MARCH_ZEC12=y
48-
CONFIG_TUNE_ZEC12=y
47+
CONFIG_MARCH_Z13=y
4948
CONFIG_NR_CPUS=512
5049
CONFIG_NUMA=y
5150
CONFIG_HZ_100=y
@@ -76,7 +75,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
7675
CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
7776
CONFIG_MODVERSIONS=y
7877
CONFIG_MODULE_SRCVERSION_ALL=y
79-
CONFIG_MODULE_SIG_SHA256=y
8078
CONFIG_BLK_DEV_THROTTLING=y
8179
CONFIG_BLK_WBT=y
8280
CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -93,6 +91,7 @@ CONFIG_UNIXWARE_DISKLABEL=y
9391
CONFIG_IOSCHED_BFQ=y
9492
CONFIG_BINFMT_MISC=m
9593
CONFIG_ZSWAP=y
94+
CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
9695
CONFIG_ZSMALLOC_STAT=y
9796
CONFIG_SLUB_STATS=y
9897
# CONFIG_COMPAT_BRK is not set
@@ -619,6 +618,9 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
619618
CONFIG_BTRFS_DEBUG=y
620619
CONFIG_BTRFS_ASSERT=y
621620
CONFIG_NILFS2_FS=m
621+
CONFIG_BCACHEFS_FS=y
622+
CONFIG_BCACHEFS_QUOTA=y
623+
CONFIG_BCACHEFS_POSIX_ACL=y
622624
CONFIG_FS_DAX=y
623625
CONFIG_EXPORTFS_BLOCK_OPS=y
624626
CONFIG_FS_ENCRYPTION=y
@@ -691,7 +693,6 @@ CONFIG_PERSISTENT_KEYRINGS=y
691693
CONFIG_ENCRYPTED_KEYS=m
692694
CONFIG_KEY_NOTIFICATIONS=y
693695
CONFIG_SECURITY=y
694-
CONFIG_SECURITY_NETWORK=y
695696
CONFIG_HARDENED_USERCOPY=y
696697
CONFIG_FORTIFY_SOURCE=y
697698
CONFIG_SECURITY_SELINUX=y

arch/s390/configs/defconfig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ CONFIG_KEXEC_FILE=y
4242
CONFIG_KEXEC_SIG=y
4343
CONFIG_CRASH_DUMP=y
4444
CONFIG_LIVEPATCH=y
45-
CONFIG_MARCH_ZEC12=y
46-
CONFIG_TUNE_ZEC12=y
45+
CONFIG_MARCH_Z13=y
4746
CONFIG_NR_CPUS=512
4847
CONFIG_NUMA=y
4948
CONFIG_HZ_100=y
@@ -71,7 +70,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
7170
CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
7271
CONFIG_MODVERSIONS=y
7372
CONFIG_MODULE_SRCVERSION_ALL=y
74-
CONFIG_MODULE_SIG_SHA256=y
7573
CONFIG_BLK_DEV_THROTTLING=y
7674
CONFIG_BLK_WBT=y
7775
CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -88,6 +86,7 @@ CONFIG_UNIXWARE_DISKLABEL=y
8886
CONFIG_IOSCHED_BFQ=y
8987
CONFIG_BINFMT_MISC=m
9088
CONFIG_ZSWAP=y
89+
CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
9190
CONFIG_ZSMALLOC_STAT=y
9291
# CONFIG_COMPAT_BRK is not set
9392
CONFIG_MEMORY_HOTPLUG=y
@@ -605,6 +604,9 @@ CONFIG_OCFS2_FS=m
605604
CONFIG_BTRFS_FS=y
606605
CONFIG_BTRFS_FS_POSIX_ACL=y
607606
CONFIG_NILFS2_FS=m
607+
CONFIG_BCACHEFS_FS=m
608+
CONFIG_BCACHEFS_QUOTA=y
609+
CONFIG_BCACHEFS_POSIX_ACL=y
608610
CONFIG_FS_DAX=y
609611
CONFIG_EXPORTFS_BLOCK_OPS=y
610612
CONFIG_FS_ENCRYPTION=y
@@ -677,7 +679,6 @@ CONFIG_PERSISTENT_KEYRINGS=y
677679
CONFIG_ENCRYPTED_KEYS=m
678680
CONFIG_KEY_NOTIFICATIONS=y
679681
CONFIG_SECURITY=y
680-
CONFIG_SECURITY_NETWORK=y
681682
CONFIG_SECURITY_SELINUX=y
682683
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
683684
CONFIG_SECURITY_LOCKDOWN_LSM=y

arch/s390/configs/zfcpdump_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ CONFIG_BPF_SYSCALL=y
99
CONFIG_BLK_DEV_INITRD=y
1010
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1111
CONFIG_CRASH_DUMP=y
12-
CONFIG_MARCH_ZEC12=y
13-
CONFIG_TUNE_ZEC12=y
12+
CONFIG_MARCH_Z13=y
1413
# CONFIG_COMPAT is not set
1514
CONFIG_NR_CPUS=2
1615
CONFIG_HZ_100=y

0 commit comments

Comments
 (0)