# 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-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 6daa755f813e6aa0bcc97e352666e072b1baac25 # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig KCONFIG_SEED=0x1F1CBD14 # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4795:warning: override: reassigning to symbol MODULE_SIG .config:4797:warning: override: reassigning to symbol PPC64 .config:4799:warning: override: reassigning to symbol SECTION_MISMATCH_WARN_ONLY .config:4800:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD .config:4804:warning: override: reassigning to symbol TRIM_UNUSED_KSYMS # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/navi10_ppt.c: In function 'navi10_get_gpu_metrics': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/navi10_ppt.c:2297:2: warning: missing braces around initializer [-Wmissing-braces] SmuMetrics_NV12_t nv12_metrics = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/navi10_ppt.c:2297:2: warning: (near initialization for 'nv12_metrics.CurrClock') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_psr_enable': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9860:9: warning: missing braces around initializer [-Wmissing-braces] struct dc_static_screen_params params = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9860:9: warning: (near initialization for 'params.triggers') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c: In function 'bios_parser_get_i2c_info': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:297:9: warning: missing braces around initializer [-Wmissing-braces] struct atom_i2c_record dummy_record = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:297:9: warning: (near initialization for 'dummy_record.record_header') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c: In function 'dcn_bw_apply_registry_override': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:638:2: error: implicit declaration of function 'enable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_START(); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:674:2: error: implicit declaration of function 'disable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_END(); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c: In function 'rn_clk_mgr_construct': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c:880:9: warning: missing braces around initializer [-Wmissing-braces] struct dpm_clocks clock_table = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c:880:9: warning: (near initialization for 'clock_table.DcfClocks') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c: In function 'vg_update_clocks': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:116:11: warning: missing braces around initializer [-Wmissing-braces] union display_idle_optimization_u idle_info = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:116:11: warning: (near initialization for 'idle_info.idle_info') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:129:10: warning: missing braces around initializer [-Wmissing-braces] union display_idle_optimization_u idle_info = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:129:10: warning: (near initialization for 'idle_info.idle_info') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c: At top level: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:704:15: warning: missing braces around initializer [-Wmissing-braces] static struct watermarks dummy_wms = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:704:15: warning: (near initialization for 'dummy_wms.WatermarkRow') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/dcn301_smu.c: In function 'dcn301_smu_enable_phy_refclk_pwrdwn': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/dcn301_smu.c:198:8: warning: missing braces around initializer [-Wmissing-braces] union display_idle_optimization_u idle_info = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/dcn301_smu.c:198:8: warning: (near initialization for 'idle_info.idle_info') [-Wmissing-braces] cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.o] Error 1 make[5]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c: In function 'dcn3_init_clocks': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c:214:2: error: implicit declaration of function 'enable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_START(); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c:216:2: error: implicit declaration of function 'disable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_END(); ^ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm/amd/amdgpu] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1872: drivers] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 # Build took: 0:03:57.975595