Skip to content

Commit 3a47b1e

Browse files
committed
s390: Update defconfigs
Just the regular update of all defconfigs. Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 833542b commit 3a47b1e

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CONFIG_USER_NS=y
3838
CONFIG_CHECKPOINT_RESTORE=y
3939
CONFIG_SCHED_AUTOGROUP=y
4040
CONFIG_EXPERT=y
41-
# CONFIG_SYSFS_SYSCALL is not set
4241
CONFIG_PROFILING=y
4342
CONFIG_KEXEC=y
4443
CONFIG_KEXEC_FILE=y
@@ -92,7 +91,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
9291
CONFIG_IOSCHED_BFQ=y
9392
CONFIG_BINFMT_MISC=m
9493
CONFIG_ZSWAP=y
95-
CONFIG_ZSMALLOC=y
9694
CONFIG_ZSMALLOC_STAT=y
9795
CONFIG_SLAB_BUCKETS=y
9896
CONFIG_SLUB_STATS=y
@@ -668,7 +666,6 @@ CONFIG_NILFS2_FS=m
668666
CONFIG_BCACHEFS_FS=y
669667
CONFIG_BCACHEFS_QUOTA=y
670668
CONFIG_BCACHEFS_POSIX_ACL=y
671-
CONFIG_FS_DAX=y
672669
CONFIG_EXPORTFS_BLOCK_OPS=y
673670
CONFIG_FS_ENCRYPTION=y
674671
CONFIG_FS_VERITY=y
@@ -738,11 +735,10 @@ CONFIG_NLS_UTF8=m
738735
CONFIG_DLM=m
739736
CONFIG_UNICODE=y
740737
CONFIG_PERSISTENT_KEYRINGS=y
738+
CONFIG_BIG_KEYS=y
741739
CONFIG_ENCRYPTED_KEYS=m
742740
CONFIG_KEY_NOTIFICATIONS=y
743741
CONFIG_SECURITY=y
744-
CONFIG_HARDENED_USERCOPY=y
745-
CONFIG_FORTIFY_SOURCE=y
746742
CONFIG_SECURITY_SELINUX=y
747743
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
748744
CONFIG_SECURITY_LOCKDOWN_LSM=y
@@ -755,6 +751,8 @@ CONFIG_IMA=y
755751
CONFIG_IMA_DEFAULT_HASH_SHA256=y
756752
CONFIG_IMA_WRITE_POLICY=y
757753
CONFIG_IMA_APPRAISE=y
754+
CONFIG_FORTIFY_SOURCE=y
755+
CONFIG_HARDENED_USERCOPY=y
758756
CONFIG_BUG_ON_DATA_CORRUPTION=y
759757
CONFIG_CRYPTO_USER=m
760758
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -770,7 +768,6 @@ CONFIG_CRYPTO_AES_TI=m
770768
CONFIG_CRYPTO_ANUBIS=m
771769
CONFIG_CRYPTO_ARIA=m
772770
CONFIG_CRYPTO_BLOWFISH=m
773-
CONFIG_CRYPTO_CAMELLIA=m
774771
CONFIG_CRYPTO_CAST5=m
775772
CONFIG_CRYPTO_CAST6=m
776773
CONFIG_CRYPTO_DES=m
@@ -815,7 +812,6 @@ CONFIG_CRYPTO_SHA3_512_S390=m
815812
CONFIG_CRYPTO_GHASH_S390=m
816813
CONFIG_CRYPTO_AES_S390=m
817814
CONFIG_CRYPTO_DES_S390=m
818-
CONFIG_CRYPTO_CHACHA_S390=m
819815
CONFIG_CRYPTO_HMAC_S390=m
820816
CONFIG_ZCRYPT=m
821817
CONFIG_PKEY=m
@@ -826,9 +822,9 @@ CONFIG_PKEY_UV=m
826822
CONFIG_CRYPTO_PAES_S390=m
827823
CONFIG_CRYPTO_DEV_VIRTIO=m
828824
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
825+
CONFIG_CRYPTO_KRB5=m
826+
CONFIG_CRYPTO_KRB5_SELFTESTS=y
829827
CONFIG_CORDIC=m
830-
CONFIG_CRYPTO_LIB_CURVE25519=m
831-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
832828
CONFIG_RANDOM32_SELFTEST=y
833829
CONFIG_XZ_DEC_MICROLZMA=y
834830
CONFIG_DMA_CMA=y

arch/s390/configs/defconfig

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ CONFIG_USER_NS=y
3636
CONFIG_CHECKPOINT_RESTORE=y
3737
CONFIG_SCHED_AUTOGROUP=y
3838
CONFIG_EXPERT=y
39-
# CONFIG_SYSFS_SYSCALL is not set
4039
CONFIG_PROFILING=y
4140
CONFIG_KEXEC=y
4241
CONFIG_KEXEC_FILE=y
@@ -86,7 +85,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
8685
CONFIG_IOSCHED_BFQ=y
8786
CONFIG_BINFMT_MISC=m
8887
CONFIG_ZSWAP=y
89-
CONFIG_ZSMALLOC=y
9088
CONFIG_ZSMALLOC_STAT=y
9189
CONFIG_SLAB_BUCKETS=y
9290
# CONFIG_COMPAT_BRK is not set
@@ -655,7 +653,6 @@ CONFIG_NILFS2_FS=m
655653
CONFIG_BCACHEFS_FS=m
656654
CONFIG_BCACHEFS_QUOTA=y
657655
CONFIG_BCACHEFS_POSIX_ACL=y
658-
CONFIG_FS_DAX=y
659656
CONFIG_EXPORTFS_BLOCK_OPS=y
660657
CONFIG_FS_ENCRYPTION=y
661658
CONFIG_FS_VERITY=y
@@ -725,6 +722,7 @@ CONFIG_NLS_UTF8=m
725722
CONFIG_DLM=m
726723
CONFIG_UNICODE=y
727724
CONFIG_PERSISTENT_KEYRINGS=y
725+
CONFIG_BIG_KEYS=y
728726
CONFIG_ENCRYPTED_KEYS=m
729727
CONFIG_KEY_NOTIFICATIONS=y
730728
CONFIG_SECURITY=y
@@ -756,7 +754,6 @@ CONFIG_CRYPTO_AES_TI=m
756754
CONFIG_CRYPTO_ANUBIS=m
757755
CONFIG_CRYPTO_ARIA=m
758756
CONFIG_CRYPTO_BLOWFISH=m
759-
CONFIG_CRYPTO_CAMELLIA=m
760757
CONFIG_CRYPTO_CAST5=m
761758
CONFIG_CRYPTO_CAST6=m
762759
CONFIG_CRYPTO_DES=m
@@ -802,7 +799,6 @@ CONFIG_CRYPTO_SHA3_512_S390=m
802799
CONFIG_CRYPTO_GHASH_S390=m
803800
CONFIG_CRYPTO_AES_S390=m
804801
CONFIG_CRYPTO_DES_S390=m
805-
CONFIG_CRYPTO_CHACHA_S390=m
806802
CONFIG_CRYPTO_HMAC_S390=m
807803
CONFIG_ZCRYPT=m
808804
CONFIG_PKEY=m
@@ -813,10 +809,10 @@ CONFIG_PKEY_UV=m
813809
CONFIG_CRYPTO_PAES_S390=m
814810
CONFIG_CRYPTO_DEV_VIRTIO=m
815811
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
812+
CONFIG_CRYPTO_KRB5=m
813+
CONFIG_CRYPTO_KRB5_SELFTESTS=y
816814
CONFIG_CORDIC=m
817815
CONFIG_PRIME_NUMBERS=m
818-
CONFIG_CRYPTO_LIB_CURVE25519=m
819-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
820816
CONFIG_XZ_DEC_MICROLZMA=y
821817
CONFIG_DMA_CMA=y
822818
CONFIG_CMA_SIZE_MBYTES=0

arch/s390/configs/zfcpdump_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ CONFIG_DEBUG_KERNEL=y
7070
CONFIG_DEBUG_INFO_DWARF4=y
7171
CONFIG_DEBUG_FS=y
7272
CONFIG_PANIC_ON_OOPS=y
73-
# CONFIG_SCHED_DEBUG is not set
7473
CONFIG_RCU_CPU_STALL_TIMEOUT=60
7574
# CONFIG_RCU_TRACE is not set
7675
# CONFIG_FTRACE is not set

0 commit comments

Comments
 (0)