Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

+13 -14

arch/s390/configs/default_defconfig

··· 69 69 CONFIG_CMA_DEBUG=y 70 70 CONFIG_CMA_DEBUGFS=y 71 71 CONFIG_MEM_SOFT_DIRTY=y 72 - CONFIG_ZPOOL=m 72 + CONFIG_ZSWAP=y 73 73 CONFIG_ZBUD=m 74 74 CONFIG_ZSMALLOC=m 75 75 CONFIG_ZSMALLOC_STAT=y ··· 141 141 CONFIG_NF_CONNTRACK_EVENTS=y 142 142 CONFIG_NF_CONNTRACK_TIMEOUT=y 143 143 CONFIG_NF_CONNTRACK_TIMESTAMP=y 144 - CONFIG_NF_CT_PROTO_DCCP=m 145 - CONFIG_NF_CT_PROTO_UDPLITE=m 146 144 CONFIG_NF_CONNTRACK_AMANDA=m 147 145 CONFIG_NF_CONNTRACK_FTP=m 148 146 CONFIG_NF_CONNTRACK_H323=m ··· 157 159 CONFIG_NFT_EXTHDR=m 158 160 CONFIG_NFT_META=m 159 161 CONFIG_NFT_CT=m 160 - CONFIG_NFT_RBTREE=m 161 - CONFIG_NFT_HASH=m 162 162 CONFIG_NFT_COUNTER=m 163 163 CONFIG_NFT_LOG=m 164 164 CONFIG_NFT_LIMIT=m 165 165 CONFIG_NFT_NAT=m 166 166 CONFIG_NFT_COMPAT=m 167 + CONFIG_NFT_HASH=m 167 168 CONFIG_NETFILTER_XT_SET=m 168 169 CONFIG_NETFILTER_XT_TARGET_AUDIT=m 169 170 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m ··· 216 219 CONFIG_NETFILTER_XT_MATCH_RATEEST=m 217 220 CONFIG_NETFILTER_XT_MATCH_REALM=m 218 221 CONFIG_NETFILTER_XT_MATCH_RECENT=m 219 - CONFIG_NETFILTER_XT_MATCH_SOCKET=m 220 222 CONFIG_NETFILTER_XT_MATCH_STATE=m 221 223 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 222 224 CONFIG_NETFILTER_XT_MATCH_STRING=m ··· 254 258 CONFIG_IP_VS_FTP=m 255 259 CONFIG_IP_VS_PE_SIP=m 256 260 CONFIG_NF_CONNTRACK_IPV4=m 257 - # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 258 261 CONFIG_NF_TABLES_IPV4=m 259 262 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 260 263 CONFIG_NF_TABLES_ARP=m ··· 431 436 CONFIG_IFB=m 432 437 CONFIG_MACVLAN=m 433 438 CONFIG_MACVTAP=m 434 - CONFIG_IPVLAN=m 435 439 CONFIG_VXLAN=m 436 440 CONFIG_TUN=m 437 441 CONFIG_VETH=m ··· 474 480 CONFIG_EXT4_FS=y 475 481 CONFIG_EXT4_FS_POSIX_ACL=y 476 482 CONFIG_EXT4_FS_SECURITY=y 483 + CONFIG_EXT4_ENCRYPTION=y 477 484 CONFIG_JBD2_DEBUG=y 478 485 CONFIG_JFS_FS=m 479 486 CONFIG_JFS_POSIX_ACL=y ··· 587 592 CONFIG_DEBUG_LOCKDEP=y 588 593 CONFIG_DEBUG_ATOMIC_SLEEP=y 589 594 CONFIG_DEBUG_LOCKING_API_SELFTESTS=y 590 - CONFIG_DEBUG_LIST=y 591 595 CONFIG_DEBUG_SG=y 592 596 CONFIG_DEBUG_NOTIFIERS=y 593 597 CONFIG_DEBUG_CREDENTIALS=y 594 598 CONFIG_RCU_TORTURE_TEST=m 595 599 CONFIG_RCU_CPU_STALL_TIMEOUT=300 596 600 CONFIG_NOTIFIER_ERROR_INJECTION=m 597 - CONFIG_CPU_NOTIFIER_ERROR_INJECT=m 598 601 CONFIG_PM_NOTIFIER_ERROR_INJECT=m 599 602 CONFIG_FAULT_INJECTION=y 600 603 CONFIG_FAILSLAB=y ··· 611 618 CONFIG_BLK_DEV_IO_TRACE=y 612 619 CONFIG_UPROBE_EVENT=y 613 620 CONFIG_FUNCTION_PROFILER=y 621 + CONFIG_HIST_TRIGGERS=y 614 622 CONFIG_TRACE_ENUM_MAP_FILE=y 615 623 CONFIG_LKDTM=m 616 624 CONFIG_TEST_LIST_SORT=y ··· 624 630 CONFIG_TEST_KSTRTOX=y 625 631 CONFIG_DMA_API_DEBUG=y 626 632 CONFIG_TEST_BPF=m 633 + CONFIG_BUG_ON_DATA_CORRUPTION=y 627 634 CONFIG_S390_PTDUMP=y 628 635 CONFIG_ENCRYPTED_KEYS=m 629 636 CONFIG_SECURITY=y ··· 635 640 CONFIG_SECURITY_SELINUX_DISABLE=y 636 641 CONFIG_IMA=y 637 642 CONFIG_IMA_APPRAISE=y 643 + CONFIG_CRYPTO_RSA=m 644 + CONFIG_CRYPTO_DH=m 645 + CONFIG_CRYPTO_ECDH=m 638 646 CONFIG_CRYPTO_USER=m 639 - # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set 640 647 CONFIG_CRYPTO_CRYPTD=m 641 648 CONFIG_CRYPTO_TEST=m 642 649 CONFIG_CRYPTO_CCM=m 643 650 CONFIG_CRYPTO_GCM=m 644 - CONFIG_CRYPTO_CTS=m 651 + CONFIG_CRYPTO_CHACHA20POLY1305=m 645 652 CONFIG_CRYPTO_LRW=m 646 653 CONFIG_CRYPTO_PCBC=m 647 - CONFIG_CRYPTO_XTS=m 654 + CONFIG_CRYPTO_KEYWRAP=m 648 655 CONFIG_CRYPTO_XCBC=m 649 656 CONFIG_CRYPTO_VMAC=m 650 657 CONFIG_CRYPTO_CRC32=m ··· 670 673 CONFIG_CRYPTO_SERPENT=m 671 674 CONFIG_CRYPTO_TEA=m 672 675 CONFIG_CRYPTO_TWOFISH=m 673 - CONFIG_CRYPTO_LZO=m 676 + CONFIG_CRYPTO_842=m 674 677 CONFIG_CRYPTO_LZ4=m 675 678 CONFIG_CRYPTO_LZ4HC=m 676 679 CONFIG_CRYPTO_USER_API_HASH=m 677 680 CONFIG_CRYPTO_USER_API_SKCIPHER=m 681 + CONFIG_CRYPTO_USER_API_RNG=m 682 + CONFIG_CRYPTO_USER_API_AEAD=m 678 683 CONFIG_ZCRYPT=m 679 684 CONFIG_CRYPTO_SHA1_S390=m 680 685 CONFIG_CRYPTO_SHA256_S390=m

+30 -20

arch/s390/configs/gcov_defconfig

··· 12 12 CONFIG_IKCONFIG=y 13 13 CONFIG_IKCONFIG_PROC=y 14 14 CONFIG_NUMA_BALANCING=y 15 + # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set 15 16 CONFIG_MEMCG=y 16 17 CONFIG_MEMCG_SWAP=y 17 18 CONFIG_BLK_CGROUP=y ··· 55 54 CONFIG_UNIXWARE_DISKLABEL=y 56 55 CONFIG_CFQ_GROUP_IOSCHED=y 57 56 CONFIG_DEFAULT_DEADLINE=y 57 + CONFIG_LIVEPATCH=y 58 58 CONFIG_TUNE_ZEC12=y 59 - CONFIG_NR_CPUS=256 59 + CONFIG_NR_CPUS=512 60 60 CONFIG_NUMA=y 61 61 CONFIG_HZ_100=y 62 62 CONFIG_MEMORY_HOTPLUG=y ··· 67 65 CONFIG_CLEANCACHE=y 68 66 CONFIG_FRONTSWAP=y 69 67 CONFIG_CMA=y 68 + CONFIG_MEM_SOFT_DIRTY=y 70 69 CONFIG_ZSWAP=y 71 70 CONFIG_ZBUD=m 72 71 CONFIG_ZSMALLOC=m ··· 139 136 CONFIG_NF_CONNTRACK_EVENTS=y 140 137 CONFIG_NF_CONNTRACK_TIMEOUT=y 141 138 CONFIG_NF_CONNTRACK_TIMESTAMP=y 142 - CONFIG_NF_CT_PROTO_DCCP=m 143 - CONFIG_NF_CT_PROTO_UDPLITE=m 144 139 CONFIG_NF_CONNTRACK_AMANDA=m 145 140 CONFIG_NF_CONNTRACK_FTP=m 146 141 CONFIG_NF_CONNTRACK_H323=m ··· 155 154 CONFIG_NFT_EXTHDR=m 156 155 CONFIG_NFT_META=m 157 156 CONFIG_NFT_CT=m 158 - CONFIG_NFT_RBTREE=m 159 - CONFIG_NFT_HASH=m 160 157 CONFIG_NFT_COUNTER=m 161 158 CONFIG_NFT_LOG=m 162 159 CONFIG_NFT_LIMIT=m 163 160 CONFIG_NFT_NAT=m 164 161 CONFIG_NFT_COMPAT=m 162 + CONFIG_NFT_HASH=m 165 163 CONFIG_NETFILTER_XT_SET=m 166 164 CONFIG_NETFILTER_XT_TARGET_AUDIT=m 167 165 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m ··· 214 214 CONFIG_NETFILTER_XT_MATCH_RATEEST=m 215 215 CONFIG_NETFILTER_XT_MATCH_REALM=m 216 216 CONFIG_NETFILTER_XT_MATCH_RECENT=m 217 - CONFIG_NETFILTER_XT_MATCH_SOCKET=m 218 217 CONFIG_NETFILTER_XT_MATCH_STATE=m 219 218 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 220 219 CONFIG_NETFILTER_XT_MATCH_STRING=m ··· 252 253 CONFIG_IP_VS_FTP=m 253 254 CONFIG_IP_VS_PE_SIP=m 254 255 CONFIG_NF_CONNTRACK_IPV4=m 255 - # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 256 256 CONFIG_NF_TABLES_IPV4=m 257 257 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 258 258 CONFIG_NF_TABLES_ARP=m ··· 428 430 CONFIG_IFB=m 429 431 CONFIG_MACVLAN=m 430 432 CONFIG_MACVTAP=m 431 - CONFIG_IPVLAN=m 432 433 CONFIG_VXLAN=m 433 434 CONFIG_TUN=m 434 435 CONFIG_VETH=m ··· 457 460 CONFIG_RAW_DRIVER=m 458 461 CONFIG_HANGCHECK_TIMER=m 459 462 CONFIG_TN3270_FS=y 463 + # CONFIG_HWMON is not set 460 464 CONFIG_WATCHDOG=y 461 465 CONFIG_WATCHDOG_NOWAYOUT=y 462 466 CONFIG_SOFT_WATCHDOG=m ··· 471 473 CONFIG_EXT4_FS=y 472 474 CONFIG_EXT4_FS_POSIX_ACL=y 473 475 CONFIG_EXT4_FS_SECURITY=y 476 + CONFIG_EXT4_ENCRYPTION=y 474 477 CONFIG_JBD2_DEBUG=y 475 478 CONFIG_JFS_FS=m 476 479 CONFIG_JFS_POSIX_ACL=y ··· 494 495 CONFIG_FUSE_FS=y 495 496 CONFIG_CUSE=m 496 497 CONFIG_OVERLAY_FS=m 498 + CONFIG_OVERLAY_FS_REDIRECT_DIR=y 497 499 CONFIG_FSCACHE=m 498 500 CONFIG_CACHEFILES=m 499 501 CONFIG_ISO9660_FS=y ··· 551 551 CONFIG_UNUSED_SYMBOLS=y 552 552 CONFIG_MAGIC_SYSRQ=y 553 553 CONFIG_DEBUG_MEMORY_INIT=y 554 - CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m 555 554 CONFIG_PANIC_ON_OOPS=y 556 555 CONFIG_TIMER_STATS=y 557 556 CONFIG_RCU_TORTURE_TEST=m 558 557 CONFIG_RCU_CPU_STALL_TIMEOUT=60 559 - CONFIG_NOTIFIER_ERROR_INJECTION=m 560 - CONFIG_CPU_NOTIFIER_ERROR_INJECT=m 561 - CONFIG_PM_NOTIFIER_ERROR_INJECT=m 562 558 CONFIG_LATENCYTOP=y 559 + CONFIG_SCHED_TRACER=y 560 + CONFIG_FTRACE_SYSCALLS=y 561 + CONFIG_STACK_TRACER=y 563 562 CONFIG_BLK_DEV_IO_TRACE=y 564 - # CONFIG_KPROBE_EVENT is not set 563 + CONFIG_UPROBE_EVENT=y 564 + CONFIG_FUNCTION_PROFILER=y 565 + CONFIG_HIST_TRIGGERS=y 565 566 CONFIG_TRACE_ENUM_MAP_FILE=y 566 567 CONFIG_LKDTM=m 567 - CONFIG_RBTREE_TEST=m 568 - CONFIG_INTERVAL_TREE_TEST=m 569 568 CONFIG_PERCPU_TEST=m 570 569 CONFIG_ATOMIC64_SELFTEST=y 571 570 CONFIG_TEST_BPF=m 571 + CONFIG_BUG_ON_DATA_CORRUPTION=y 572 572 CONFIG_S390_PTDUMP=y 573 + CONFIG_PERSISTENT_KEYRINGS=y 574 + CONFIG_BIG_KEYS=y 573 575 CONFIG_ENCRYPTED_KEYS=m 574 576 CONFIG_SECURITY=y 575 577 CONFIG_SECURITY_NETWORK=y ··· 579 577 CONFIG_SECURITY_SELINUX_BOOTPARAM=y 580 578 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 581 579 CONFIG_SECURITY_SELINUX_DISABLE=y 580 + CONFIG_INTEGRITY_SIGNATURE=y 581 + CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y 582 582 CONFIG_IMA=y 583 + CONFIG_IMA_WRITE_POLICY=y 583 584 CONFIG_IMA_APPRAISE=y 585 + CONFIG_CRYPTO_DH=m 586 + CONFIG_CRYPTO_ECDH=m 584 587 CONFIG_CRYPTO_USER=m 585 588 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set 589 + CONFIG_CRYPTO_PCRYPT=m 586 590 CONFIG_CRYPTO_CRYPTD=m 591 + CONFIG_CRYPTO_MCRYPTD=m 587 592 CONFIG_CRYPTO_TEST=m 588 593 CONFIG_CRYPTO_CCM=m 589 594 CONFIG_CRYPTO_GCM=m 590 - CONFIG_CRYPTO_CTS=m 595 + CONFIG_CRYPTO_CHACHA20POLY1305=m 591 596 CONFIG_CRYPTO_LRW=m 592 597 CONFIG_CRYPTO_PCBC=m 593 - CONFIG_CRYPTO_XTS=m 598 + CONFIG_CRYPTO_KEYWRAP=m 594 599 CONFIG_CRYPTO_XCBC=m 595 600 CONFIG_CRYPTO_VMAC=m 596 601 CONFIG_CRYPTO_CRC32=m ··· 607 598 CONFIG_CRYPTO_RMD256=m 608 599 CONFIG_CRYPTO_RMD320=m 609 600 CONFIG_CRYPTO_SHA512=m 601 + CONFIG_CRYPTO_SHA3=m 610 602 CONFIG_CRYPTO_TGR192=m 611 603 CONFIG_CRYPTO_WP512=m 612 604 CONFIG_CRYPTO_ANUBIS=m ··· 622 612 CONFIG_CRYPTO_SERPENT=m 623 613 CONFIG_CRYPTO_TEA=m 624 614 CONFIG_CRYPTO_TWOFISH=m 615 + CONFIG_CRYPTO_842=m 625 616 CONFIG_CRYPTO_LZ4=m 626 617 CONFIG_CRYPTO_LZ4HC=m 627 618 CONFIG_CRYPTO_USER_API_HASH=m 628 619 CONFIG_CRYPTO_USER_API_SKCIPHER=m 620 + CONFIG_CRYPTO_USER_API_RNG=m 621 + CONFIG_CRYPTO_USER_API_AEAD=m 629 622 CONFIG_ZCRYPT=m 630 623 CONFIG_CRYPTO_SHA1_S390=m 631 624 CONFIG_CRYPTO_SHA256_S390=m ··· 637 624 CONFIG_CRYPTO_AES_S390=m 638 625 CONFIG_CRYPTO_GHASH_S390=m 639 626 CONFIG_CRYPTO_CRC32_S390=y 640 - CONFIG_ASYMMETRIC_KEY_TYPE=y 641 - CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m 642 - CONFIG_X509_CERTIFICATE_PARSER=m 643 627 CONFIG_CRC7=m 644 628 CONFIG_CRC8=m 645 629 CONFIG_CORDIC=m

+21 -12

arch/s390/configs/performance_defconfig

··· 65 65 CONFIG_CLEANCACHE=y 66 66 CONFIG_FRONTSWAP=y 67 67 CONFIG_CMA=y 68 + CONFIG_MEM_SOFT_DIRTY=y 68 69 CONFIG_ZSWAP=y 69 70 CONFIG_ZBUD=m 70 71 CONFIG_ZSMALLOC=m ··· 137 136 CONFIG_NF_CONNTRACK_EVENTS=y 138 137 CONFIG_NF_CONNTRACK_TIMEOUT=y 139 138 CONFIG_NF_CONNTRACK_TIMESTAMP=y 140 - CONFIG_NF_CT_PROTO_DCCP=m 141 - CONFIG_NF_CT_PROTO_UDPLITE=m 142 139 CONFIG_NF_CONNTRACK_AMANDA=m 143 140 CONFIG_NF_CONNTRACK_FTP=m 144 141 CONFIG_NF_CONNTRACK_H323=m ··· 153 154 CONFIG_NFT_EXTHDR=m 154 155 CONFIG_NFT_META=m 155 156 CONFIG_NFT_CT=m 156 - CONFIG_NFT_RBTREE=m 157 - CONFIG_NFT_HASH=m 158 157 CONFIG_NFT_COUNTER=m 159 158 CONFIG_NFT_LOG=m 160 159 CONFIG_NFT_LIMIT=m 161 160 CONFIG_NFT_NAT=m 162 161 CONFIG_NFT_COMPAT=m 162 + CONFIG_NFT_HASH=m 163 163 CONFIG_NETFILTER_XT_SET=m 164 164 CONFIG_NETFILTER_XT_TARGET_AUDIT=m 165 165 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m ··· 212 214 CONFIG_NETFILTER_XT_MATCH_RATEEST=m 213 215 CONFIG_NETFILTER_XT_MATCH_REALM=m 214 216 CONFIG_NETFILTER_XT_MATCH_RECENT=m 215 - CONFIG_NETFILTER_XT_MATCH_SOCKET=m 216 217 CONFIG_NETFILTER_XT_MATCH_STATE=m 217 218 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 218 219 CONFIG_NETFILTER_XT_MATCH_STRING=m ··· 250 253 CONFIG_IP_VS_FTP=m 251 254 CONFIG_IP_VS_PE_SIP=m 252 255 CONFIG_NF_CONNTRACK_IPV4=m 253 - # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 254 256 CONFIG_NF_TABLES_IPV4=m 255 257 CONFIG_NFT_CHAIN_ROUTE_IPV4=m 256 258 CONFIG_NF_TABLES_ARP=m ··· 426 430 CONFIG_IFB=m 427 431 CONFIG_MACVLAN=m 428 432 CONFIG_MACVTAP=m 429 - CONFIG_IPVLAN=m 430 433 CONFIG_VXLAN=m 431 434 CONFIG_TUN=m 432 435 CONFIG_VETH=m ··· 469 474 CONFIG_EXT4_FS=y 470 475 CONFIG_EXT4_FS_POSIX_ACL=y 471 476 CONFIG_EXT4_FS_SECURITY=y 477 + CONFIG_EXT4_ENCRYPTION=y 472 478 CONFIG_JBD2_DEBUG=y 473 479 CONFIG_JFS_FS=m 474 480 CONFIG_JFS_POSIX_ACL=y ··· 492 496 CONFIG_FUSE_FS=y 493 497 CONFIG_CUSE=m 494 498 CONFIG_OVERLAY_FS=m 499 + CONFIG_OVERLAY_FS_REDIRECT_DIR=y 495 500 CONFIG_FSCACHE=m 496 501 CONFIG_CACHEFILES=m 497 502 CONFIG_ISO9660_FS=y ··· 560 563 CONFIG_BLK_DEV_IO_TRACE=y 561 564 CONFIG_UPROBE_EVENT=y 562 565 CONFIG_FUNCTION_PROFILER=y 566 + CONFIG_HIST_TRIGGERS=y 563 567 CONFIG_TRACE_ENUM_MAP_FILE=y 564 568 CONFIG_LKDTM=m 565 569 CONFIG_PERCPU_TEST=m 566 570 CONFIG_ATOMIC64_SELFTEST=y 567 571 CONFIG_TEST_BPF=m 572 + CONFIG_BUG_ON_DATA_CORRUPTION=y 568 573 CONFIG_S390_PTDUMP=y 574 + CONFIG_PERSISTENT_KEYRINGS=y 575 + CONFIG_BIG_KEYS=y 569 576 CONFIG_ENCRYPTED_KEYS=m 570 577 CONFIG_SECURITY=y 571 578 CONFIG_SECURITY_NETWORK=y ··· 577 576 CONFIG_SECURITY_SELINUX_BOOTPARAM=y 578 577 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 579 578 CONFIG_SECURITY_SELINUX_DISABLE=y 579 + CONFIG_INTEGRITY_SIGNATURE=y 580 + CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y 580 581 CONFIG_IMA=y 582 + CONFIG_IMA_WRITE_POLICY=y 581 583 CONFIG_IMA_APPRAISE=y 584 + CONFIG_CRYPTO_DH=m 585 + CONFIG_CRYPTO_ECDH=m 582 586 CONFIG_CRYPTO_USER=m 583 587 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set 588 + CONFIG_CRYPTO_PCRYPT=m 584 589 CONFIG_CRYPTO_CRYPTD=m 590 + CONFIG_CRYPTO_MCRYPTD=m 585 591 CONFIG_CRYPTO_TEST=m 586 592 CONFIG_CRYPTO_CCM=m 587 593 CONFIG_CRYPTO_GCM=m 588 - CONFIG_CRYPTO_CTS=m 594 + CONFIG_CRYPTO_CHACHA20POLY1305=m 589 595 CONFIG_CRYPTO_LRW=m 590 596 CONFIG_CRYPTO_PCBC=m 591 - CONFIG_CRYPTO_XTS=m 597 + CONFIG_CRYPTO_KEYWRAP=m 592 598 CONFIG_CRYPTO_XCBC=m 593 599 CONFIG_CRYPTO_VMAC=m 594 600 CONFIG_CRYPTO_CRC32=m ··· 605 597 CONFIG_CRYPTO_RMD256=m 606 598 CONFIG_CRYPTO_RMD320=m 607 599 CONFIG_CRYPTO_SHA512=m 600 + CONFIG_CRYPTO_SHA3=m 608 601 CONFIG_CRYPTO_TGR192=m 609 602 CONFIG_CRYPTO_WP512=m 610 603 CONFIG_CRYPTO_ANUBIS=m ··· 620 611 CONFIG_CRYPTO_SERPENT=m 621 612 CONFIG_CRYPTO_TEA=m 622 613 CONFIG_CRYPTO_TWOFISH=m 614 + CONFIG_CRYPTO_842=m 623 615 CONFIG_CRYPTO_LZ4=m 624 616 CONFIG_CRYPTO_LZ4HC=m 625 617 CONFIG_CRYPTO_USER_API_HASH=m 626 618 CONFIG_CRYPTO_USER_API_SKCIPHER=m 619 + CONFIG_CRYPTO_USER_API_RNG=m 620 + CONFIG_CRYPTO_USER_API_AEAD=m 627 621 CONFIG_ZCRYPT=m 628 622 CONFIG_CRYPTO_SHA1_S390=m 629 623 CONFIG_CRYPTO_SHA256_S390=m ··· 635 623 CONFIG_CRYPTO_AES_S390=m 636 624 CONFIG_CRYPTO_GHASH_S390=m 637 625 CONFIG_CRYPTO_CRC32_S390=y 638 - CONFIG_ASYMMETRIC_KEY_TYPE=y 639 - CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m 640 - CONFIG_X509_CERTIFICATE_PARSER=m 641 626 CONFIG_CRC7=m 642 627 CONFIG_CRC8=m 643 628 CONFIG_CORDIC=m

+3 -2

arch/s390/defconfig

··· 38 38 CONFIG_STATIC_KEYS_SELFTEST=y 39 39 CONFIG_MODULES=y 40 40 CONFIG_MODULE_UNLOAD=y 41 - CONFIG_MODVERSIONS=y 42 41 CONFIG_BLK_DEV_INTEGRITY=y 43 42 CONFIG_PARTITION_ADVANCED=y 44 43 CONFIG_IBM_PARTITION=y ··· 129 130 CONFIG_EQUALIZER=m 130 131 CONFIG_TUN=m 131 132 CONFIG_VIRTIO_NET=y 133 + # CONFIG_NET_VENDOR_ALACRITECH is not set 134 + # CONFIG_NET_VENDOR_SOLARFLARE is not set 132 135 # CONFIG_INPUT is not set 133 136 # CONFIG_SERIO is not set 137 + CONFIG_DEVKMEM=y 134 138 CONFIG_RAW_DRIVER=m 135 139 CONFIG_VIRTIO_BALLOON=y 136 140 CONFIG_EXT4_FS=y ··· 185 183 CONFIG_KPROBES_SANITY_TEST=y 186 184 CONFIG_S390_PTDUMP=y 187 185 CONFIG_CRYPTO_CRYPTD=m 188 - CONFIG_CRYPTO_AUTHENC=m 189 186 CONFIG_CRYPTO_TEST=m 190 187 CONFIG_CRYPTO_CCM=m 191 188 CONFIG_CRYPTO_GCM=m

+3 -1

arch/s390/include/asm/ctl_reg.h

··· 15 15 BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\ 16 16 asm volatile( \ 17 17 " lctlg %1,%2,%0\n" \ 18 - : : "Q" (*(addrtype *)(&array)), "i" (low), "i" (high));\ 18 + : \ 19 + : "Q" (*(addrtype *)(&array)), "i" (low), "i" (high) \ 20 + : "memory"); \ 19 21 } 20 22 21 23 #define __ctl_store(array, low, high) { \

Configure Feed

Configure Feed