# git rev-parse -q --verify 6daa755f813e6aa0bcc97e352666e072b1baac25^{commit} 6daa755f813e6aa0bcc97e352666e072b1baac25 already have revision, skipping fetch # git checkout -q -f -B kisskb 6daa755f813e6aa0bcc97e352666e072b1baac25 # git clean -qxdf # < git log -1 # commit 6daa755f813e6aa0bcc97e352666e072b1baac25 # Merge: c6536676c7fe 6f3353c2d2b3 # Author: Linus Torvalds # Date: Tue Apr 27 17:54:15 2021 -0700 # # Merge tag 's390-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux # # Pull s390 updates from Heiko Carstens: # # - fix buffer size for in-kernel disassembler for ebpf programs. # # - fix two memory leaks in zcrypt driver. # # - expose PCI device UID as index, including an indicator if the uid is # unique. # # - remove some oprofile leftovers. # # - improve stack unwinder tests. # # - don't use gcc atomic builtins anymore, just like all other # architectures. Even though I'm sure the current code is ok, I totally # dislike that s390 is the only architecture being special here; # especially considering that there was a lengthly discussion about # this topic and the outcome was not to use the builtins. Therefore # open-code atomic ops again with inline assembly and switch to gcc # builtins as soon as other architectures are doing. # # - couple of other changes to atomic and cmpxchg, and use # atomic-instrumented.h for KASAN. # # - separate zbus creation, registration, and scanning in our PCI code # which allows for cleaner and easier handling. # # - a rather large change to the vfio-ap code to fix circular locking # dependencies when updating crypto masks. # # - move QAOB handling from qdio layer down to drivers. # # - add CRW inject facility to common I/O layer. This adds debugs files # which allow to generate artificial events from user space for testing # purposes. # # - increase SCLP console line length from 80 to 320 characters to avoid # odd wrapped lines. # # - add protected virtualization guest and host indication files, which # indicate either that a guest is running in pv mode or if the # hypervisor is capable of starting pv guests. # # - various other small fixes and improvements all over the place. # # * tag 's390-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (53 commits) # s390/disassembler: increase ebpf disasm buffer size # s390/archrandom: add parameter check for s390_arch_random_generate # s390/zcrypt: fix zcard and zqueue hot-unplug memleak # s390/pci: expose a PCI device's UID as its index # s390/atomic,cmpxchg: always inline __xchg/__cmpxchg # s390/smp: fix do_restart() prototype # s390: get rid of oprofile leftovers # s390/atomic,cmpxchg: make constraints work with old compilers # s390/test_unwind: print test suite start/end info # s390/cmpxchg: use unsigned long values instead of void pointers # s390/test_unwind: add WARN if tests failed # s390/test_unwind: unify error handling paths # s390: update defconfigs # s390/spinlock: use R constraint in inline assembly # s390/atomic,cmpxchg: switch to use atomic-instrumented.h # s390/cmpxchg: get rid of gcc atomic builtins # s390/atomic: get rid of gcc atomic builtins # s390/atomic: use proper constraints # s390/atomic: move remaining inline assemblies to atomic_ops.h # s390/bitops: make bitops only work on longs # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 6daa755f813e6aa0bcc97e352666e072b1baac25 # < make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:12980:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/lib/bitfield_kunit.c: In function 'test_bitfields_constants': /kisskb/src/lib/bitfield_kunit.c:93:1: warning: the frame size of 4200 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:261: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:392: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:262: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:393: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) FIT description: Linux 5.12.0+ Created: Wed Apr 28 13:54:29 2021 Image 0 (kernel@0) Description: Linux 5.12.0+ Created: Wed Apr 28 13:54:29 2021 Type: Kernel Image Compression: gzip compressed Data Size: 10290237 Bytes = 10049.06 KiB = 9.81 MiB Architecture: MIPS OS: Linux Load Address: 0x84000000 Entry Point: 0x8549cee0 Hash algo: sha1 Hash value: bdc3b75eb98dfe8da62565c03087f629d639df87 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 4659 Bytes = 4.55 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 5bcb6e4f21e8e5372544aa130b3bd097355a9050 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 5418 Bytes = 5.29 KiB = 0.01 MiB Architecture: MIPS Hash algo: sha1 Hash value: 93d882f2009a217e0fa9dab94788535ed2be8476 Image 5 (fdt@luton_pcb091) Description: MSCC Luton PCB091 Device Tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 2303 Bytes = 2.25 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: daa8a8147bbce692d81383af7b748a763212bb24 Image 6 (fdt@jaguar2_pcb110) Description: MSCC Jaguar2 PCB110 Device Tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 7509 Bytes = 7.33 KiB = 0.01 MiB Architecture: MIPS Hash algo: sha1 Hash value: 73c08d98d7aaf64b3e82483d33954c951cfb8067 Image 7 (fdt@jaguar2_pcb111) Description: MSCC Jaguar2 PCB111 Device Tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 4581 Bytes = 4.47 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: d8ab1c8279a311c512005c256502f85a33651fe9 Image 8 (fdt@serval_pcb105) Description: MSCC Serval PCB105 Device Tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 4545 Bytes = 4.44 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 372c736c817c1313650e487910d7b94a32816bd7 Image 9 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Wed Apr 28 13:54:29 2021 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (pcb091) Description: Luton Linux kernel Kernel: kernel@0 FDT: fdt@luton_pcb091 Configuration 6 (pcb110) Description: Jaguar2 Linux kernel Kernel: kernel@0 Init Ramdisk: ramdisk FDT: fdt@jaguar2_pcb110 Configuration 7 (pcb111) Description: Jaguar2 Linux kernel Kernel: kernel@0 Init Ramdisk: ramdisk FDT: fdt@jaguar2_pcb111 Configuration 8 (pcb105) Description: Serval Linux kernel Kernel: kernel@0 Init Ramdisk: ramdisk FDT: fdt@serval_pcb105 Configuration 9 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:29:03.323047