Merge tag 's390-6.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

+10 -4

arch/s390/configs/debug_defconfig

··· 40 40 CONFIG_EXPERT=y 41 41 # CONFIG_SYSFS_SYSCALL is not set 42 42 CONFIG_PROFILING=y 43 + CONFIG_KEXEC_FILE=y 44 + CONFIG_KEXEC_SIG=y 45 + CONFIG_CRASH_DUMP=y 43 46 CONFIG_LIVEPATCH=y 44 47 CONFIG_MARCH_ZEC12=y 45 48 CONFIG_TUNE_ZEC12=y 46 49 CONFIG_NR_CPUS=512 47 50 CONFIG_NUMA=y 48 51 CONFIG_HZ_100=y 49 - CONFIG_KEXEC_FILE=y 50 - CONFIG_KEXEC_SIG=y 52 + CONFIG_CERT_STORE=y 51 53 CONFIG_EXPOLINE=y 52 54 CONFIG_EXPOLINE_AUTO=y 53 55 CONFIG_CHSC_SCH=y 54 56 CONFIG_VFIO_CCW=m 55 57 CONFIG_VFIO_AP=m 56 - CONFIG_CRASH_DUMP=y 57 58 CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y 58 59 CONFIG_CMM=m 59 60 CONFIG_APPLDATA_BASE=y 61 + CONFIG_S390_HYPFS_FS=y 60 62 CONFIG_KVM=m 61 63 CONFIG_S390_UNWIND_SELFTEST=m 62 64 CONFIG_S390_KPROBES_SANITY_TEST=m ··· 436 434 CONFIG_SCSI_DH_ALUA=m 437 435 CONFIG_MD=y 438 436 CONFIG_BLK_DEV_MD=y 437 + # CONFIG_MD_BITMAP_FILE is not set 439 438 CONFIG_MD_LINEAR=m 440 439 CONFIG_MD_MULTIPATH=m 441 440 CONFIG_MD_FAULTY=m ··· 580 577 CONFIG_DIAG288_WATCHDOG=m 581 578 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set 582 579 CONFIG_FB=y 580 + # CONFIG_FB_DEVICE is not set 583 581 CONFIG_FRAMEBUFFER_CONSOLE=y 584 582 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 585 583 # CONFIG_HID_SUPPORT is not set ··· 651 647 CONFIG_TMPFS=y 652 648 CONFIG_TMPFS_POSIX_ACL=y 653 649 CONFIG_TMPFS_INODE64=y 650 + CONFIG_TMPFS_QUOTA=y 654 651 CONFIG_HUGETLBFS=y 655 652 CONFIG_ECRYPT_FS=m 656 653 CONFIG_CRAMFS=m ··· 708 703 CONFIG_IMA_APPRAISE=y 709 704 CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor" 710 705 CONFIG_INIT_STACK_NONE=y 706 + CONFIG_BUG_ON_DATA_CORRUPTION=y 711 707 CONFIG_CRYPTO_USER=m 712 708 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set 713 709 CONFIG_CRYPTO_PCRYPT=m ··· 831 825 CONFIG_DEBUG_ATOMIC_SLEEP=y 832 826 CONFIG_DEBUG_LOCKING_API_SELFTESTS=y 833 827 CONFIG_DEBUG_IRQFLAGS=y 828 + CONFIG_DEBUG_LIST=y 834 829 CONFIG_DEBUG_SG=y 835 830 CONFIG_DEBUG_NOTIFIERS=y 836 - CONFIG_BUG_ON_DATA_CORRUPTION=y 837 831 CONFIG_DEBUG_CREDENTIALS=y 838 832 CONFIG_RCU_TORTURE_TEST=m 839 833 CONFIG_RCU_REF_SCALE_TEST=m

+9 -4

arch/s390/configs/defconfig

··· 38 38 CONFIG_EXPERT=y 39 39 # CONFIG_SYSFS_SYSCALL is not set 40 40 CONFIG_PROFILING=y 41 + CONFIG_KEXEC_FILE=y 42 + CONFIG_KEXEC_SIG=y 43 + CONFIG_CRASH_DUMP=y 41 44 CONFIG_LIVEPATCH=y 42 45 CONFIG_MARCH_ZEC12=y 43 46 CONFIG_TUNE_ZEC12=y 44 47 CONFIG_NR_CPUS=512 45 48 CONFIG_NUMA=y 46 49 CONFIG_HZ_100=y 47 - CONFIG_KEXEC_FILE=y 48 - CONFIG_KEXEC_SIG=y 50 + CONFIG_CERT_STORE=y 49 51 CONFIG_EXPOLINE=y 50 52 CONFIG_EXPOLINE_AUTO=y 51 53 CONFIG_CHSC_SCH=y 52 54 CONFIG_VFIO_CCW=m 53 55 CONFIG_VFIO_AP=m 54 - CONFIG_CRASH_DUMP=y 55 56 CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y 56 57 CONFIG_CMM=m 57 58 CONFIG_APPLDATA_BASE=y 59 + CONFIG_S390_HYPFS_FS=y 58 60 CONFIG_KVM=m 59 61 CONFIG_S390_UNWIND_SELFTEST=m 60 62 CONFIG_S390_KPROBES_SANITY_TEST=m ··· 426 424 CONFIG_SCSI_DH_ALUA=m 427 425 CONFIG_MD=y 428 426 CONFIG_BLK_DEV_MD=y 427 + # CONFIG_MD_BITMAP_FILE is not set 429 428 CONFIG_MD_LINEAR=m 430 429 CONFIG_MD_MULTIPATH=m 431 430 CONFIG_MD_FAULTY=m ··· 569 566 CONFIG_SOFT_WATCHDOG=m 570 567 CONFIG_DIAG288_WATCHDOG=m 571 568 CONFIG_FB=y 569 + # CONFIG_FB_DEVICE is not set 572 570 CONFIG_FRAMEBUFFER_CONSOLE=y 573 571 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 574 572 # CONFIG_HID_SUPPORT is not set ··· 636 632 CONFIG_TMPFS=y 637 633 CONFIG_TMPFS_POSIX_ACL=y 638 634 CONFIG_TMPFS_INODE64=y 635 + CONFIG_TMPFS_QUOTA=y 639 636 CONFIG_HUGETLBFS=y 640 637 CONFIG_CONFIGFS_FS=m 641 638 CONFIG_ECRYPT_FS=m ··· 692 687 CONFIG_IMA_APPRAISE=y 693 688 CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor" 694 689 CONFIG_INIT_STACK_NONE=y 690 + CONFIG_BUG_ON_DATA_CORRUPTION=y 695 691 CONFIG_CRYPTO_FIPS=y 696 692 CONFIG_CRYPTO_USER=m 697 693 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set ··· 787 781 CONFIG_DEBUG_MEMORY_INIT=y 788 782 CONFIG_PANIC_ON_OOPS=y 789 783 CONFIG_TEST_LOCKUP=m 790 - CONFIG_BUG_ON_DATA_CORRUPTION=y 791 784 CONFIG_RCU_TORTURE_TEST=m 792 785 CONFIG_RCU_REF_SCALE_TEST=m 793 786 CONFIG_RCU_CPU_STALL_TIMEOUT=60

+2 -2

arch/s390/configs/zfcpdump_defconfig

··· 8 8 # CONFIG_NET_NS is not set 9 9 CONFIG_BLK_DEV_INITRD=y 10 10 CONFIG_CC_OPTIMIZE_FOR_SIZE=y 11 + CONFIG_CRASH_DUMP=y 11 12 CONFIG_MARCH_ZEC12=y 12 13 CONFIG_TUNE_ZEC12=y 13 14 # CONFIG_COMPAT is not set ··· 16 15 CONFIG_HZ_100=y 17 16 # CONFIG_CHSC_SCH is not set 18 17 # CONFIG_SCM_BUS is not set 19 - CONFIG_CRASH_DUMP=y 20 18 # CONFIG_PFAULT is not set 21 - # CONFIG_S390_HYPFS_FS is not set 19 + # CONFIG_S390_HYPFS is not set 22 20 # CONFIG_VIRTUALIZATION is not set 23 21 # CONFIG_S390_GUEST is not set 24 22 # CONFIG_SECCOMP is not set

+4 -3

arch/s390/kernel/cert_store.c

··· 432 432 char *desc; 433 433 434 434 cs_token = vcssb->cs_token; 435 - /* Description string contains "%64s:%04u:%08u\0". */ 435 + /* Description string contains "%64s:%05u:%010u\0". */ 436 436 name_len = sizeof(vce->vce_hdr.vc_name); 437 - len = name_len + 1 + 4 + 1 + 8 + 1; 437 + len = name_len + 1 + 5 + 1 + 10 + 1; 438 438 desc = kmalloc(len, GFP_KERNEL); 439 439 if (!desc) 440 440 return NULL; 441 441 442 442 memcpy(desc, vce->vce_hdr.vc_name, name_len); 443 - sprintf(desc + name_len, ":%04u:%08u", vce->vce_hdr.vc_index, cs_token); 443 + snprintf(desc + name_len, len - name_len, ":%05u:%010u", 444 + vce->vce_hdr.vc_index, cs_token); 444 445 445 446 return desc; 446 447 }

Configure Feed

Configure Feed