tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull s390 fixes from Heiko Carstens:

- Fix potential overlap of pseudo-MMIO addresses with MIO addresses

- Fix stack unwinder test case inline assembly compile error that
happens with LLVM's integrated assembler

- Update defconfigs

* tag 's390-5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: update defconfigs
s390/pci: move pseudo-MMIO to prevent MIO overlap
s390/test_unwind: use raw opcode instead of invalid instruction

Linus Torvalds 757f3e6d a2aeaeab

+23 -8
+8 -2
arch/s390/configs/debug_defconfig
··· 403 403 CONFIG_CONNECTOR=y 404 404 CONFIG_ZRAM=y 405 405 CONFIG_BLK_DEV_LOOP=m 406 - CONFIG_BLK_DEV_CRYPTOLOOP=m 407 406 CONFIG_BLK_DEV_DRBD=m 408 407 CONFIG_BLK_DEV_NBD=m 409 408 CONFIG_BLK_DEV_RAM=y ··· 475 476 CONFIG_MACVTAP=m 476 477 CONFIG_VXLAN=m 477 478 CONFIG_BAREUDP=m 479 + CONFIG_AMT=m 478 480 CONFIG_TUN=m 479 481 CONFIG_VETH=m 480 482 CONFIG_VIRTIO_NET=m ··· 489 489 # CONFIG_NET_VENDOR_AMD is not set 490 490 # CONFIG_NET_VENDOR_AQUANTIA is not set 491 491 # CONFIG_NET_VENDOR_ARC is not set 492 + # CONFIG_NET_VENDOR_ASIX is not set 492 493 # CONFIG_NET_VENDOR_ATHEROS is not set 493 494 # CONFIG_NET_VENDOR_BROADCOM is not set 494 495 # CONFIG_NET_VENDOR_BROCADE is not set ··· 572 571 CONFIG_WATCHDOG_NOWAYOUT=y 573 572 CONFIG_SOFT_WATCHDOG=m 574 573 CONFIG_DIAG288_WATCHDOG=m 574 + # CONFIG_DRM_DEBUG_MODESET_LOCK is not set 575 575 CONFIG_FB=y 576 576 CONFIG_FRAMEBUFFER_CONSOLE=y 577 577 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y ··· 777 775 CONFIG_CRC7=m 778 776 CONFIG_CRC8=m 779 777 CONFIG_RANDOM32_SELFTEST=y 778 + CONFIG_XZ_DEC_MICROLZMA=y 780 779 CONFIG_DMA_CMA=y 781 780 CONFIG_CMA_SIZE_MBYTES=0 782 781 CONFIG_PRINTK_TIME=y 783 782 CONFIG_DYNAMIC_DEBUG=y 784 783 CONFIG_DEBUG_INFO=y 785 784 CONFIG_DEBUG_INFO_DWARF4=y 785 + CONFIG_DEBUG_INFO_BTF=y 786 786 CONFIG_GDB_SCRIPTS=y 787 787 CONFIG_HEADERS_INSTALL=y 788 788 CONFIG_DEBUG_SECTION_MISMATCH=y ··· 811 807 CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m 812 808 CONFIG_DEBUG_PER_CPU_MAPS=y 813 809 CONFIG_KFENCE=y 810 + CONFIG_KFENCE_STATIC_KEYS=y 814 811 CONFIG_DEBUG_SHIRQ=y 815 812 CONFIG_PANIC_ON_OOPS=y 816 813 CONFIG_DETECT_HUNG_TASK=y ··· 847 842 CONFIG_SAMPLES=y 848 843 CONFIG_SAMPLE_TRACE_PRINTK=m 849 844 CONFIG_SAMPLE_FTRACE_DIRECT=m 845 + CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m 850 846 CONFIG_DEBUG_ENTRY=y 851 847 CONFIG_CIO_INJECT=y 852 848 CONFIG_KUNIT=m ··· 866 860 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 867 861 CONFIG_LKDTM=m 868 862 CONFIG_TEST_MIN_HEAP=y 869 - CONFIG_KPROBES_SANITY_TEST=y 863 + CONFIG_KPROBES_SANITY_TEST=m 870 864 CONFIG_RBTREE_TEST=y 871 865 CONFIG_INTERVAL_TREE_TEST=m 872 866 CONFIG_PERCPU_TEST=m
+6 -1
arch/s390/configs/defconfig
··· 394 394 CONFIG_CONNECTOR=y 395 395 CONFIG_ZRAM=y 396 396 CONFIG_BLK_DEV_LOOP=m 397 - CONFIG_BLK_DEV_CRYPTOLOOP=m 398 397 CONFIG_BLK_DEV_DRBD=m 399 398 CONFIG_BLK_DEV_NBD=m 400 399 CONFIG_BLK_DEV_RAM=y ··· 466 467 CONFIG_MACVTAP=m 467 468 CONFIG_VXLAN=m 468 469 CONFIG_BAREUDP=m 470 + CONFIG_AMT=m 469 471 CONFIG_TUN=m 470 472 CONFIG_VETH=m 471 473 CONFIG_VIRTIO_NET=m ··· 480 480 # CONFIG_NET_VENDOR_AMD is not set 481 481 # CONFIG_NET_VENDOR_AQUANTIA is not set 482 482 # CONFIG_NET_VENDOR_ARC is not set 483 + # CONFIG_NET_VENDOR_ASIX is not set 483 484 # CONFIG_NET_VENDOR_ATHEROS is not set 484 485 # CONFIG_NET_VENDOR_BROADCOM is not set 485 486 # CONFIG_NET_VENDOR_BROCADE is not set ··· 763 762 CONFIG_CRC4=m 764 763 CONFIG_CRC7=m 765 764 CONFIG_CRC8=m 765 + CONFIG_XZ_DEC_MICROLZMA=y 766 766 CONFIG_DMA_CMA=y 767 767 CONFIG_CMA_SIZE_MBYTES=0 768 768 CONFIG_PRINTK_TIME=y 769 769 CONFIG_DYNAMIC_DEBUG=y 770 770 CONFIG_DEBUG_INFO=y 771 771 CONFIG_DEBUG_INFO_DWARF4=y 772 + CONFIG_DEBUG_INFO_BTF=y 772 773 CONFIG_GDB_SCRIPTS=y 773 774 CONFIG_DEBUG_SECTION_MISMATCH=y 774 775 CONFIG_MAGIC_SYSRQ=y ··· 795 792 CONFIG_SAMPLES=y 796 793 CONFIG_SAMPLE_TRACE_PRINTK=m 797 794 CONFIG_SAMPLE_FTRACE_DIRECT=m 795 + CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m 798 796 CONFIG_KUNIT=m 799 797 CONFIG_KUNIT_DEBUGFS=y 800 798 CONFIG_LKDTM=m 799 + CONFIG_KPROBES_SANITY_TEST=m 801 800 CONFIG_PERCPU_TEST=m 802 801 CONFIG_ATOMIC64_SELFTEST=y 803 802 CONFIG_TEST_BPF=m
+2
arch/s390/configs/zfcpdump_defconfig
··· 65 65 # CONFIG_NETWORK_FILESYSTEMS is not set 66 66 CONFIG_LSM="yama,loadpin,safesetid,integrity" 67 67 # CONFIG_ZLIB_DFLTCC is not set 68 + CONFIG_XZ_DEC_MICROLZMA=y 68 69 CONFIG_PRINTK_TIME=y 69 70 # CONFIG_SYMBOLIC_ERRNAME is not set 70 71 CONFIG_DEBUG_INFO=y 72 + CONFIG_DEBUG_INFO_BTF=y 71 73 CONFIG_DEBUG_FS=y 72 74 CONFIG_DEBUG_KERNEL=y 73 75 CONFIG_PANIC_ON_OOPS=y
+4 -3
arch/s390/include/asm/pci_io.h
··· 14 14 15 15 /* I/O Map */ 16 16 #define ZPCI_IOMAP_SHIFT 48 17 - #define ZPCI_IOMAP_ADDR_BASE 0x8000000000000000UL 17 + #define ZPCI_IOMAP_ADDR_SHIFT 62 18 + #define ZPCI_IOMAP_ADDR_BASE (1UL << ZPCI_IOMAP_ADDR_SHIFT) 18 19 #define ZPCI_IOMAP_ADDR_OFF_MASK ((1UL << ZPCI_IOMAP_SHIFT) - 1) 19 20 #define ZPCI_IOMAP_MAX_ENTRIES \ 20 - ((ULONG_MAX - ZPCI_IOMAP_ADDR_BASE + 1) / (1UL << ZPCI_IOMAP_SHIFT)) 21 + (1UL << (ZPCI_IOMAP_ADDR_SHIFT - ZPCI_IOMAP_SHIFT)) 21 22 #define ZPCI_IOMAP_ADDR_IDX_MASK \ 22 - (~ZPCI_IOMAP_ADDR_OFF_MASK - ZPCI_IOMAP_ADDR_BASE) 23 + ((ZPCI_IOMAP_ADDR_BASE - 1) & ~ZPCI_IOMAP_ADDR_OFF_MASK) 23 24 24 25 struct zpci_iomap_entry { 25 26 u32 fh;
+3 -2
arch/s390/lib/test_unwind.c
··· 173 173 } 174 174 175 175 /* 176 - * trigger specification exception 176 + * Trigger operation exception; use insn notation to bypass 177 + * llvm's integrated assembler sanity checks. 177 178 */ 178 179 asm volatile( 179 - " mvcl %%r1,%%r1\n" 180 + " .insn e,0x0000\n" /* illegal opcode */ 180 181 "0: nopr %%r7\n" 181 182 EX_TABLE(0b, 0b) 182 183 :);