# 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/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 6daa755f813e6aa0bcc97e352666e072b1baac25 # < make -s -j 10 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 10 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 10 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:4567:warning: override: reassigning to symbol GCC_PLUGIN_CYC_COMPLEXITY .config:4569:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:4573:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4575:warning: override: reassigning to symbol UML_NET_SLIP .config:4578:warning: override: reassigning to symbol UML_NET_MCAST .config:4580:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 10 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] drivers/net/ethernet/xilinx/ll_temac_main.o: In function `temac_probe': /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1409: undefined reference to `devm_platform_ioremap_resource_byname' /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1476: undefined reference to `devm_of_iomap' /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1502: undefined reference to `devm_platform_ioremap_resource' drivers/net/ethernet/xilinx/xilinx_emaclite.o: In function `xemaclite_of_probe': /kisskb/src/drivers/net/ethernet/xilinx/xilinx_emaclite.c:1146: undefined reference to `devm_ioremap_resource' drivers/net/ethernet/xilinx/xilinx_axienet_main.o: In function `axienet_probe': /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1879: undefined reference to `devm_ioremap_resource' /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1987: undefined reference to `devm_ioremap_resource' /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1997: undefined reference to `devm_ioremap_resource' collect2: error: ld returned 1 exit status make[2]: *** [/kisskb/src/Makefile:1220: vmlinux] Error 1 make[1]: *** [/kisskb/src/Makefile:1199: autoksyms_recursive] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 10 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:07:04.115804