Merge tag 's390-5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

+35 -9

arch/s390/configs/debug_defconfig

··· 1 1 CONFIG_SYSVIPC=y 2 2 CONFIG_POSIX_MQUEUE=y 3 + CONFIG_WATCH_QUEUE=y 3 4 CONFIG_AUDIT=y 4 5 CONFIG_NO_HZ_IDLE=y 5 6 CONFIG_HIGH_RES_TIMERS=y ··· 15 14 CONFIG_IKCONFIG_PROC=y 16 15 CONFIG_NUMA_BALANCING=y 17 16 CONFIG_MEMCG=y 18 - CONFIG_MEMCG_SWAP=y 19 17 CONFIG_BLK_CGROUP=y 20 18 CONFIG_CFS_BANDWIDTH=y 21 19 CONFIG_RT_GROUP_SCHED=y ··· 31 31 CONFIG_USER_NS=y 32 32 CONFIG_CHECKPOINT_RESTORE=y 33 33 CONFIG_SCHED_AUTOGROUP=y 34 - CONFIG_BLK_DEV_INITRD=y 35 34 CONFIG_EXPERT=y 36 35 # CONFIG_SYSFS_SYSCALL is not set 36 + CONFIG_BPF_LSM=y 37 37 CONFIG_BPF_SYSCALL=y 38 38 CONFIG_USERFAULTFD=y 39 39 # CONFIG_COMPAT_BRK is not set ··· 51 51 CONFIG_VFIO_CCW=m 52 52 CONFIG_VFIO_AP=m 53 53 CONFIG_CRASH_DUMP=y 54 - CONFIG_HIBERNATION=y 55 - CONFIG_PM_DEBUG=y 56 54 CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y 57 55 CONFIG_CMM=m 58 56 CONFIG_APPLDATA_BASE=y 59 57 CONFIG_KVM=m 60 - CONFIG_VHOST_NET=m 61 - CONFIG_VHOST_VSOCK=m 58 + CONFIG_S390_UNWIND_SELFTEST=y 62 59 CONFIG_OPROFILE=m 63 60 CONFIG_KPROBES=y 64 61 CONFIG_JUMP_LABEL=y ··· 74 77 CONFIG_BLK_WBT=y 75 78 CONFIG_BLK_CGROUP_IOLATENCY=y 76 79 CONFIG_BLK_CGROUP_IOCOST=y 80 + CONFIG_BLK_INLINE_ENCRYPTION=y 81 + CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y 77 82 CONFIG_PARTITION_ADVANCED=y 78 83 CONFIG_IBM_PARTITION=y 79 84 CONFIG_BSD_DISKLABEL=y ··· 95 96 CONFIG_CMA_DEBUGFS=y 96 97 CONFIG_MEM_SOFT_DIRTY=y 97 98 CONFIG_ZSWAP=y 98 - CONFIG_ZBUD=m 99 99 CONFIG_ZSMALLOC=m 100 100 CONFIG_ZSMALLOC_STAT=y 101 101 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y ··· 128 130 CONFIG_NET_IPVTI=m 129 131 CONFIG_INET_AH=m 130 132 CONFIG_INET_ESP=m 133 + CONFIG_INET_ESPINTCP=y 131 134 CONFIG_INET_IPCOMP=m 132 135 CONFIG_INET_DIAG=m 133 136 CONFIG_INET_UDP_DIAG=m ··· 143 144 CONFIG_IPV6_ROUTER_PREF=y 144 145 CONFIG_INET6_AH=m 145 146 CONFIG_INET6_ESP=m 147 + CONFIG_INET6_ESPINTCP=y 146 148 CONFIG_INET6_IPCOMP=m 147 149 CONFIG_IPV6_MIP6=m 148 150 CONFIG_IPV6_VTI=m ··· 151 151 CONFIG_IPV6_GRE=m 152 152 CONFIG_IPV6_MULTIPLE_TABLES=y 153 153 CONFIG_IPV6_SUBTREES=y 154 + CONFIG_IPV6_RPL_LWTUNNEL=y 155 + CONFIG_MPTCP=y 154 156 CONFIG_NETFILTER=y 157 + CONFIG_BRIDGE_NETFILTER=m 155 158 CONFIG_NF_CONNTRACK=m 156 159 CONFIG_NF_CONNTRACK_SECMARK=y 157 160 CONFIG_NF_CONNTRACK_EVENTS=y ··· 320 317 CONFIG_L2TP_IP=m 321 318 CONFIG_L2TP_ETH=m 322 319 CONFIG_BRIDGE=m 320 + CONFIG_BRIDGE_MRP=y 323 321 CONFIG_VLAN_8021Q=m 324 322 CONFIG_VLAN_8021Q_GVRP=y 325 323 CONFIG_NET_SCHED=y ··· 345 341 CONFIG_NET_SCH_FQ_CODEL=m 346 342 CONFIG_NET_SCH_INGRESS=m 347 343 CONFIG_NET_SCH_PLUG=m 344 + CONFIG_NET_SCH_ETS=m 348 345 CONFIG_NET_CLS_BASIC=m 349 346 CONFIG_NET_CLS_TCINDEX=m 350 347 CONFIG_NET_CLS_ROUTE4=m ··· 369 364 CONFIG_NET_ACT_SIMP=m 370 365 CONFIG_NET_ACT_SKBEDIT=m 371 366 CONFIG_NET_ACT_CSUM=m 367 + CONFIG_NET_ACT_GATE=m 372 368 CONFIG_DNS_RESOLVER=y 373 369 CONFIG_OPENVSWITCH=m 374 370 CONFIG_VSOCKETS=m ··· 380 374 CONFIG_NET_PKTGEN=m 381 375 # CONFIG_NET_DROP_MONITOR is not set 382 376 CONFIG_PCI=y 377 + # CONFIG_PCIEASPM is not set 383 378 CONFIG_PCI_DEBUG=y 384 379 CONFIG_HOTPLUG_PCI=y 385 380 CONFIG_HOTPLUG_PCI_S390=y ··· 442 435 CONFIG_DM_MULTIPATH=m 443 436 CONFIG_DM_MULTIPATH_QL=m 444 437 CONFIG_DM_MULTIPATH_ST=m 438 + CONFIG_DM_MULTIPATH_HST=m 445 439 CONFIG_DM_DELAY=m 446 440 CONFIG_DM_UEVENT=y 447 441 CONFIG_DM_FLAKEY=m ··· 456 448 CONFIG_IFB=m 457 449 CONFIG_MACVLAN=m 458 450 CONFIG_MACVTAP=m 451 + CONFIG_VXLAN=m 452 + CONFIG_BAREUDP=m 459 453 CONFIG_TUN=m 460 454 CONFIG_VETH=m 461 455 CONFIG_VIRTIO_NET=m ··· 491 481 CONFIG_MLX4_EN=m 492 482 CONFIG_MLX5_CORE=m 493 483 CONFIG_MLX5_CORE_EN=y 494 - # CONFIG_MLXFW is not set 495 484 # CONFIG_NET_VENDOR_MICREL is not set 496 485 # CONFIG_NET_VENDOR_MICROCHIP is not set 497 486 # CONFIG_NET_VENDOR_MICROSEMI is not set ··· 523 514 # CONFIG_NET_VENDOR_TI is not set 524 515 # CONFIG_NET_VENDOR_VIA is not set 525 516 # CONFIG_NET_VENDOR_WIZNET is not set 517 + # CONFIG_NET_VENDOR_XILINX is not set 526 518 CONFIG_PPP=m 527 519 CONFIG_PPP_BSDCOMP=m 528 520 CONFIG_PPP_DEFLATE=m ··· 571 561 CONFIG_VIRTIO_PCI=m 572 562 CONFIG_VIRTIO_BALLOON=m 573 563 CONFIG_VIRTIO_INPUT=y 564 + CONFIG_VHOST_NET=m 565 + CONFIG_VHOST_VSOCK=m 574 566 CONFIG_S390_CCW_IOMMU=y 575 567 CONFIG_S390_AP_IOMMU=y 576 568 CONFIG_EXT4_FS=y ··· 620 608 CONFIG_UDF_FS=m 621 609 CONFIG_MSDOS_FS=m 622 610 CONFIG_VFAT_FS=m 611 + CONFIG_EXFAT_FS=m 623 612 CONFIG_NTFS_FS=m 624 613 CONFIG_NTFS_RW=y 625 614 CONFIG_PROC_KCORE=y ··· 663 650 CONFIG_DLM=m 664 651 CONFIG_UNICODE=y 665 652 CONFIG_PERSISTENT_KEYRINGS=y 666 - CONFIG_BIG_KEYS=y 667 653 CONFIG_ENCRYPTED_KEYS=m 654 + CONFIG_KEY_NOTIFICATIONS=y 668 655 CONFIG_SECURITY=y 669 656 CONFIG_SECURITY_NETWORK=y 670 657 CONFIG_FORTIFY_SOURCE=y ··· 688 675 CONFIG_CRYPTO_DH=m 689 676 CONFIG_CRYPTO_ECDH=m 690 677 CONFIG_CRYPTO_ECRDSA=m 678 + CONFIG_CRYPTO_CURVE25519=m 679 + CONFIG_CRYPTO_GCM=y 691 680 CONFIG_CRYPTO_CHACHA20POLY1305=m 692 681 CONFIG_CRYPTO_AEGIS128=m 682 + CONFIG_CRYPTO_SEQIV=y 693 683 CONFIG_CRYPTO_CFB=m 694 684 CONFIG_CRYPTO_LRW=m 695 685 CONFIG_CRYPTO_PCBC=m ··· 701 685 CONFIG_CRYPTO_XCBC=m 702 686 CONFIG_CRYPTO_VMAC=m 703 687 CONFIG_CRYPTO_CRC32=m 688 + CONFIG_CRYPTO_BLAKE2S=m 704 689 CONFIG_CRYPTO_MICHAEL_MIC=m 705 690 CONFIG_CRYPTO_RMD128=m 706 691 CONFIG_CRYPTO_RMD160=m ··· 718 701 CONFIG_CRYPTO_CAMELLIA=m 719 702 CONFIG_CRYPTO_CAST5=m 720 703 CONFIG_CRYPTO_CAST6=m 704 + CONFIG_CRYPTO_DES=m 721 705 CONFIG_CRYPTO_FCRYPT=m 722 706 CONFIG_CRYPTO_KHAZAD=m 723 707 CONFIG_CRYPTO_SALSA20=m ··· 737 719 CONFIG_CRYPTO_USER_API_RNG=m 738 720 CONFIG_CRYPTO_USER_API_AEAD=m 739 721 CONFIG_CRYPTO_STATS=y 722 + CONFIG_CRYPTO_LIB_BLAKE2S=m 723 + CONFIG_CRYPTO_LIB_CURVE25519=m 724 + CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m 740 725 CONFIG_ZCRYPT=m 741 726 CONFIG_PKEY=m 742 727 CONFIG_CRYPTO_PAES_S390=m ··· 795 774 CONFIG_PANIC_ON_OOPS=y 796 775 CONFIG_DETECT_HUNG_TASK=y 797 776 CONFIG_WQ_WATCHDOG=y 777 + CONFIG_TEST_LOCKUP=m 798 778 CONFIG_DEBUG_TIMEKEEPING=y 799 779 CONFIG_PROVE_LOCKING=y 800 780 CONFIG_LOCK_STAT=y ··· 808 786 CONFIG_DEBUG_CREDENTIALS=y 809 787 CONFIG_RCU_TORTURE_TEST=m 810 788 CONFIG_RCU_CPU_STALL_TIMEOUT=300 789 + # CONFIG_RCU_TRACE is not set 811 790 CONFIG_LATENCYTOP=y 791 + CONFIG_BOOTTIME_TRACING=y 812 792 CONFIG_FUNCTION_PROFILER=y 813 793 CONFIG_STACK_TRACER=y 814 794 CONFIG_IRQSOFF_TRACER=y ··· 832 808 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 833 809 CONFIG_LKDTM=m 834 810 CONFIG_TEST_LIST_SORT=y 811 + CONFIG_TEST_MIN_HEAP=y 835 812 CONFIG_TEST_SORT=y 836 813 CONFIG_KPROBES_SANITY_TEST=y 837 814 CONFIG_RBTREE_TEST=y 838 815 CONFIG_INTERVAL_TREE_TEST=m 839 816 CONFIG_PERCPU_TEST=m 840 817 CONFIG_ATOMIC64_SELFTEST=y 818 + CONFIG_TEST_BITOPS=m 841 819 CONFIG_TEST_BPF=m

+33 -10

arch/s390/configs/defconfig

··· 1 1 CONFIG_SYSVIPC=y 2 2 CONFIG_POSIX_MQUEUE=y 3 + CONFIG_WATCH_QUEUE=y 3 4 CONFIG_AUDIT=y 4 5 CONFIG_NO_HZ_IDLE=y 5 6 CONFIG_HIGH_RES_TIMERS=y ··· 14 13 CONFIG_IKCONFIG_PROC=y 15 14 CONFIG_NUMA_BALANCING=y 16 15 CONFIG_MEMCG=y 17 - CONFIG_MEMCG_SWAP=y 18 16 CONFIG_BLK_CGROUP=y 19 17 CONFIG_CFS_BANDWIDTH=y 20 18 CONFIG_RT_GROUP_SCHED=y ··· 30 30 CONFIG_USER_NS=y 31 31 CONFIG_CHECKPOINT_RESTORE=y 32 32 CONFIG_SCHED_AUTOGROUP=y 33 - CONFIG_BLK_DEV_INITRD=y 34 33 CONFIG_EXPERT=y 35 34 # CONFIG_SYSFS_SYSCALL is not set 35 + CONFIG_BPF_LSM=y 36 36 CONFIG_BPF_SYSCALL=y 37 37 CONFIG_USERFAULTFD=y 38 38 # CONFIG_COMPAT_BRK is not set ··· 41 41 CONFIG_TUNE_ZEC12=y 42 42 CONFIG_NR_CPUS=512 43 43 CONFIG_NUMA=y 44 - # CONFIG_NUMA_EMU is not set 45 44 CONFIG_HZ_100=y 46 45 CONFIG_KEXEC_FILE=y 47 46 CONFIG_KEXEC_SIG=y ··· 50 51 CONFIG_VFIO_CCW=m 51 52 CONFIG_VFIO_AP=m 52 53 CONFIG_CRASH_DUMP=y 53 - CONFIG_HIBERNATION=y 54 - CONFIG_PM_DEBUG=y 55 54 CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y 56 55 CONFIG_CMM=m 57 56 CONFIG_APPLDATA_BASE=y 58 57 CONFIG_KVM=m 59 - CONFIG_VHOST_NET=m 60 - CONFIG_VHOST_VSOCK=m 58 + CONFIG_S390_UNWIND_SELFTEST=m 61 59 CONFIG_OPROFILE=m 62 60 CONFIG_KPROBES=y 63 61 CONFIG_JUMP_LABEL=y ··· 70 74 CONFIG_BLK_WBT=y 71 75 CONFIG_BLK_CGROUP_IOLATENCY=y 72 76 CONFIG_BLK_CGROUP_IOCOST=y 77 + CONFIG_BLK_INLINE_ENCRYPTION=y 78 + CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y 73 79 CONFIG_PARTITION_ADVANCED=y 74 80 CONFIG_IBM_PARTITION=y 75 81 CONFIG_BSD_DISKLABEL=y ··· 89 91 CONFIG_FRONTSWAP=y 90 92 CONFIG_MEM_SOFT_DIRTY=y 91 93 CONFIG_ZSWAP=y 92 - CONFIG_ZBUD=m 93 94 CONFIG_ZSMALLOC=m 94 95 CONFIG_ZSMALLOC_STAT=y 95 96 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y ··· 122 125 CONFIG_NET_IPVTI=m 123 126 CONFIG_INET_AH=m 124 127 CONFIG_INET_ESP=m 128 + CONFIG_INET_ESPINTCP=y 125 129 CONFIG_INET_IPCOMP=m 126 130 CONFIG_INET_DIAG=m 127 131 CONFIG_INET_UDP_DIAG=m ··· 137 139 CONFIG_IPV6_ROUTER_PREF=y 138 140 CONFIG_INET6_AH=m 139 141 CONFIG_INET6_ESP=m 142 + CONFIG_INET6_ESPINTCP=y 140 143 CONFIG_INET6_IPCOMP=m 141 144 CONFIG_IPV6_MIP6=m 142 145 CONFIG_IPV6_VTI=m ··· 145 146 CONFIG_IPV6_GRE=m 146 147 CONFIG_IPV6_MULTIPLE_TABLES=y 147 148 CONFIG_IPV6_SUBTREES=y 149 + CONFIG_IPV6_RPL_LWTUNNEL=y 150 + CONFIG_MPTCP=y 148 151 CONFIG_NETFILTER=y 152 + CONFIG_BRIDGE_NETFILTER=m 149 153 CONFIG_NF_CONNTRACK=m 150 154 CONFIG_NF_CONNTRACK_SECMARK=y 151 155 CONFIG_NF_CONNTRACK_EVENTS=y ··· 313 311 CONFIG_L2TP_IP=m 314 312 CONFIG_L2TP_ETH=m 315 313 CONFIG_BRIDGE=m 314 + CONFIG_BRIDGE_MRP=y 316 315 CONFIG_VLAN_8021Q=m 317 316 CONFIG_VLAN_8021Q_GVRP=y 318 317 CONFIG_NET_SCHED=y ··· 338 335 CONFIG_NET_SCH_FQ_CODEL=m 339 336 CONFIG_NET_SCH_INGRESS=m 340 337 CONFIG_NET_SCH_PLUG=m 338 + CONFIG_NET_SCH_ETS=m 341 339 CONFIG_NET_CLS_BASIC=m 342 340 CONFIG_NET_CLS_TCINDEX=m 343 341 CONFIG_NET_CLS_ROUTE4=m ··· 362 358 CONFIG_NET_ACT_SIMP=m 363 359 CONFIG_NET_ACT_SKBEDIT=m 364 360 CONFIG_NET_ACT_CSUM=m 361 + CONFIG_NET_ACT_GATE=m 365 362 CONFIG_DNS_RESOLVER=y 366 363 CONFIG_OPENVSWITCH=m 367 364 CONFIG_VSOCKETS=m ··· 373 368 CONFIG_NET_PKTGEN=m 374 369 # CONFIG_NET_DROP_MONITOR is not set 375 370 CONFIG_PCI=y 371 + # CONFIG_PCIEASPM is not set 376 372 CONFIG_HOTPLUG_PCI=y 377 373 CONFIG_HOTPLUG_PCI_S390=y 378 374 CONFIG_UEVENT_HELPER=y ··· 436 430 CONFIG_DM_MULTIPATH=m 437 431 CONFIG_DM_MULTIPATH_QL=m 438 432 CONFIG_DM_MULTIPATH_ST=m 433 + CONFIG_DM_MULTIPATH_HST=m 439 434 CONFIG_DM_DELAY=m 440 435 CONFIG_DM_UEVENT=y 441 436 CONFIG_DM_FLAKEY=m ··· 451 444 CONFIG_IFB=m 452 445 CONFIG_MACVLAN=m 453 446 CONFIG_MACVTAP=m 447 + CONFIG_VXLAN=m 448 + CONFIG_BAREUDP=m 454 449 CONFIG_TUN=m 455 450 CONFIG_VETH=m 456 451 CONFIG_VIRTIO_NET=m ··· 486 477 CONFIG_MLX4_EN=m 487 478 CONFIG_MLX5_CORE=m 488 479 CONFIG_MLX5_CORE_EN=y 489 - # CONFIG_MLXFW is not set 490 480 # CONFIG_NET_VENDOR_MICREL is not set 491 481 # CONFIG_NET_VENDOR_MICROCHIP is not set 492 482 # CONFIG_NET_VENDOR_MICROSEMI is not set ··· 518 510 # CONFIG_NET_VENDOR_TI is not set 519 511 # CONFIG_NET_VENDOR_VIA is not set 520 512 # CONFIG_NET_VENDOR_WIZNET is not set 513 + # CONFIG_NET_VENDOR_XILINX is not set 521 514 CONFIG_PPP=m 522 515 CONFIG_PPP_BSDCOMP=m 523 516 CONFIG_PPP_DEFLATE=m ··· 566 557 CONFIG_VIRTIO_PCI=m 567 558 CONFIG_VIRTIO_BALLOON=m 568 559 CONFIG_VIRTIO_INPUT=y 560 + CONFIG_VHOST_NET=m 561 + CONFIG_VHOST_VSOCK=m 569 562 CONFIG_S390_CCW_IOMMU=y 570 563 CONFIG_S390_AP_IOMMU=y 571 564 CONFIG_EXT4_FS=y ··· 611 600 CONFIG_UDF_FS=m 612 601 CONFIG_MSDOS_FS=m 613 602 CONFIG_VFAT_FS=m 603 + CONFIG_EXFAT_FS=m 614 604 CONFIG_NTFS_FS=m 615 605 CONFIG_NTFS_RW=y 616 606 CONFIG_PROC_KCORE=y ··· 654 642 CONFIG_DLM=m 655 643 CONFIG_UNICODE=y 656 644 CONFIG_PERSISTENT_KEYRINGS=y 657 - CONFIG_BIG_KEYS=y 658 645 CONFIG_ENCRYPTED_KEYS=m 646 + CONFIG_KEY_NOTIFICATIONS=y 659 647 CONFIG_SECURITY=y 660 648 CONFIG_SECURITY_NETWORK=y 661 649 CONFIG_SECURITY_SELINUX=y ··· 679 667 CONFIG_CRYPTO_DH=m 680 668 CONFIG_CRYPTO_ECDH=m 681 669 CONFIG_CRYPTO_ECRDSA=m 670 + CONFIG_CRYPTO_CURVE25519=m 671 + CONFIG_CRYPTO_GCM=y 682 672 CONFIG_CRYPTO_CHACHA20POLY1305=m 683 673 CONFIG_CRYPTO_AEGIS128=m 674 + CONFIG_CRYPTO_SEQIV=y 684 675 CONFIG_CRYPTO_CFB=m 685 676 CONFIG_CRYPTO_LRW=m 686 677 CONFIG_CRYPTO_OFB=m ··· 693 678 CONFIG_CRYPTO_XCBC=m 694 679 CONFIG_CRYPTO_VMAC=m 695 680 CONFIG_CRYPTO_CRC32=m 681 + CONFIG_CRYPTO_BLAKE2S=m 696 682 CONFIG_CRYPTO_MICHAEL_MIC=m 697 683 CONFIG_CRYPTO_RMD128=m 698 684 CONFIG_CRYPTO_RMD160=m ··· 710 694 CONFIG_CRYPTO_CAMELLIA=m 711 695 CONFIG_CRYPTO_CAST5=m 712 696 CONFIG_CRYPTO_CAST6=m 697 + CONFIG_CRYPTO_DES=m 713 698 CONFIG_CRYPTO_FCRYPT=m 714 699 CONFIG_CRYPTO_KHAZAD=m 715 700 CONFIG_CRYPTO_SALSA20=m ··· 729 712 CONFIG_CRYPTO_USER_API_RNG=m 730 713 CONFIG_CRYPTO_USER_API_AEAD=m 731 714 CONFIG_CRYPTO_STATS=y 715 + CONFIG_CRYPTO_LIB_BLAKE2S=m 716 + CONFIG_CRYPTO_LIB_CURVE25519=m 717 + CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m 732 718 CONFIG_ZCRYPT=m 733 719 CONFIG_PKEY=m 734 720 CONFIG_CRYPTO_PAES_S390=m ··· 745 725 CONFIG_CRYPTO_GHASH_S390=m 746 726 CONFIG_CRYPTO_CRC32_S390=y 747 727 CONFIG_CORDIC=m 728 + CONFIG_PRIME_NUMBERS=m 748 729 CONFIG_CRC4=m 749 730 CONFIG_CRC7=m 750 731 CONFIG_CRC8=m ··· 760 739 CONFIG_MAGIC_SYSRQ=y 761 740 CONFIG_DEBUG_MEMORY_INIT=y 762 741 CONFIG_PANIC_ON_OOPS=y 742 + CONFIG_TEST_LOCKUP=m 763 743 CONFIG_BUG_ON_DATA_CORRUPTION=y 764 744 CONFIG_RCU_TORTURE_TEST=m 765 745 CONFIG_RCU_CPU_STALL_TIMEOUT=60 766 746 CONFIG_LATENCYTOP=y 747 + CONFIG_BOOTTIME_TRACING=y 767 748 CONFIG_FUNCTION_PROFILER=y 768 749 CONFIG_STACK_TRACER=y 769 750 CONFIG_SCHED_TRACER=y

+5

arch/s390/configs/zfcpdump_defconfig

··· 30 30 # CONFIG_BOUNCE is not set 31 31 CONFIG_NET=y 32 32 # CONFIG_IUCV is not set 33 + # CONFIG_ETHTOOL_NETLINK is not set 33 34 CONFIG_DEVTMPFS=y 34 35 CONFIG_BLK_DEV_RAM=y 35 36 # CONFIG_BLK_DEV_XPRAM is not set ··· 56 55 # CONFIG_MONWRITER is not set 57 56 # CONFIG_S390_VMUR is not set 58 57 # CONFIG_HID is not set 58 + # CONFIG_VIRTIO_MENU is not set 59 + # CONFIG_VHOST_MENU is not set 59 60 # CONFIG_IOMMU_SUPPORT is not set 60 61 # CONFIG_DNOTIFY is not set 61 62 # CONFIG_INOTIFY_USER is not set ··· 65 62 # CONFIG_MISC_FILESYSTEMS is not set 66 63 # CONFIG_NETWORK_FILESYSTEMS is not set 67 64 CONFIG_LSM="yama,loadpin,safesetid,integrity" 65 + # CONFIG_ZLIB_DFLTCC is not set 68 66 CONFIG_PRINTK_TIME=y 67 + # CONFIG_SYMBOLIC_ERRNAME is not set 69 68 CONFIG_DEBUG_INFO=y 70 69 CONFIG_DEBUG_FS=y 71 70 CONFIG_DEBUG_KERNEL=y

+10 -1

arch/s390/kernel/perf_cpum_sf.c

··· 881 881 return err; 882 882 } 883 883 884 + static bool is_callchain_event(struct perf_event *event) 885 + { 886 + u64 sample_type = event->attr.sample_type; 887 + 888 + return sample_type & (PERF_SAMPLE_CALLCHAIN | PERF_SAMPLE_REGS_USER | 889 + PERF_SAMPLE_STACK_USER); 890 + } 891 + 884 892 static int cpumsf_pmu_event_init(struct perf_event *event) 885 893 { 886 894 int err; 887 895 888 896 /* No support for taken branch sampling */ 889 - if (has_branch_stack(event)) 897 + /* No support for callchain, stacks and registers */ 898 + if (has_branch_stack(event) || is_callchain_event(event)) 890 899 return -EOPNOTSUPP; 891 900 892 901 switch (event->attr.type) {

+1

arch/s390/kernel/setup.c

··· 1100 1100 if (IS_ENABLED(CONFIG_EXPOLINE_AUTO)) 1101 1101 nospec_auto_detect(); 1102 1102 1103 + jump_label_init(); 1103 1104 parse_early_param(); 1104 1105 #ifdef CONFIG_CRASH_DUMP 1105 1106 /* Deactivate elfcorehdr= kernel parameter */

+9 -5

arch/s390/mm/maccess.c

··· 62 62 long copied; 63 63 64 64 spin_lock_irqsave(&s390_kernel_write_lock, flags); 65 - while (size) { 66 - copied = s390_kernel_write_odd(tmp, src, size); 67 - tmp += copied; 68 - src += copied; 69 - size -= copied; 65 + if (!(flags & PSW_MASK_DAT)) { 66 + memcpy(dst, src, size); 67 + } else { 68 + while (size) { 69 + copied = s390_kernel_write_odd(tmp, src, size); 70 + tmp += copied; 71 + src += copied; 72 + size -= copied; 73 + } 70 74 } 71 75 spin_unlock_irqrestore(&s390_kernel_write_lock, flags); 72 76

+12 -1

arch/s390/pci/pci_event.c

··· 94 94 } 95 95 zdev->fh = ccdf->fh; 96 96 zdev->state = ZPCI_FN_STATE_CONFIGURED; 97 - zpci_create_device(zdev); 97 + ret = zpci_enable_device(zdev); 98 + if (ret) 99 + break; 100 + 101 + pdev = pci_scan_single_device(zdev->zbus->bus, zdev->devfn); 102 + if (!pdev) 103 + break; 104 + 105 + pci_bus_add_device(pdev); 106 + pci_lock_rescan_remove(); 107 + pci_bus_add_devices(zdev->zbus->bus); 108 + pci_unlock_rescan_remove(); 98 109 break; 99 110 case 0x0302: /* Reserved -> Standby */ 100 111 if (!zdev) {

+1

drivers/s390/cio/vfio_ccw_chp.c

··· 8 8 * Eric Farman <farman@linux.ibm.com> 9 9 */ 10 10 11 + #include <linux/slab.h> 11 12 #include <linux/vfio.h> 12 13 #include "vfio_ccw_private.h" 13 14