# git rev-parse -q --verify f55966571d5eb2876a11e48e798b4592fa1ffbb7^{commit} f55966571d5eb2876a11e48e798b4592fa1ffbb7 already have revision, skipping fetch # git checkout -q -f -B kisskb f55966571d5eb2876a11e48e798b4592fa1ffbb7 # git clean -qxdf # < git log -1 # commit f55966571d5eb2876a11e48e798b4592fa1ffbb7 # Merge: 8c1bfd746030 21c355b09711 # Author: Linus Torvalds # Date: Thu Jul 8 12:28:15 2021 -0700 # # Merge tag 'drm-next-2021-07-08-1' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "Some fixes for rc1 that came in the past weeks, mainly a bunch of # amdgpu fixes, some i915 and the rest are misc around the place. I'm # sending this a bit early so some more stuff may show up, but I'll # probably take tomorrow off. # # dma-buf: # - doc fixes # # amdgpu: # - Misc Navi fixes # - Powergating fix # - Yellow Carp updates # - Beige Goby updates # - S0ix fix # - Revert overlay validation fix # - GPU reset fix for DC # - PPC64 fix # - Add new dimgrey cavefish DID # - RAS fix # - TTM fixes # # amdkfd: # - SVM fixes # # radeon: # - Fix missing drm_gem_object_put in error path # - NULL ptr deref fix # # i915: # - display DP VSC fix # - DG1 display fix # - IRQ fixes # - IRQ demidlayering # # gma500: # - bo leaks in error paths fixed" # # * tag 'drm-next-2021-07-08-1' of git://anongit.freedesktop.org/drm/drm: (52 commits) # drm/i915: Drop all references to DRM IRQ midlayer # drm/i915: Use the correct IRQ during resume # drm/i915/display/dg1: Correctly map DPLLs during state readout # drm/i915/display: Do not zero past infoframes.vsc # drm/amdgpu: Conditionally reset SDMA RAS error counts # drm/amdkfd: Maintain svm_bo reference in page->zone_device_data # drm/amdkfd: add invalid pages debug at vram migration # drm/amdkfd: skip migration for pages already in VRAM # drm/amdkfd: skip invalid pages during migrations # drm/amdkfd: classify and map mixed svm range pages in GPU # drm/amdkfd: use hmm range fault to get both domain pfns # drm/amdgpu: get owner ref in validate and map # drm/amdkfd: set owner ref to svm range prefault # drm/amdkfd: add owner ref param to get hmm pages # drm/amdkfd: device pgmap owner at the svm migrate init # drm/amdkfd: inc counter on child ranges with xnack off # drm/amd/display: Extend DMUB diagnostic logging to DCN3.1 # drm/amdgpu: Update NV SIMD-per-CU to 2 # drm/amdgpu: add new dimgrey cavefish DID # drm/amd/pm: skip PrepareMp1ForUnload message in s0ix # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 f55966571d5eb2876a11e48e798b4592fa1ffbb7 # < make -s -j 120 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- allmodconfig # < make -s -j 120 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 120 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig # make -s -j 120 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- /kisskb/src/kernel/trace/trace_osnoise.c: In function 'start_kthread': /kisskb/src/kernel/trace/trace_osnoise.c:1461:8: warning: 'main' is usually a function [-Wmain] void *main = osnoise_main; ^~~~ /kisskb/src/lib/test_scanf.c: In function 'numbers_list_field_width_val_width': /kisskb/src/lib/test_scanf.c:530:1: warning: the frame size of 2512 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/test_scanf.c: In function 'numbers_list_field_width_typemax': /kisskb/src/lib/test_scanf.c:488:1: warning: the frame size of 3008 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/test_scanf.c: In function 'numbers_list': /kisskb/src/lib/test_scanf.c:437:1: warning: the frame size of 2512 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/include/linux/byteorder/little_endian.h:5, from /kisskb/src/arch/arm64/include/uapi/asm/byteorder.h:23, from /kisskb/src/include/asm-generic/bitops/le.h:7, from /kisskb/src/arch/arm64/include/asm/bitops.h:29, from /kisskb/src/include/linux/bitops.h:32, from /kisskb/src/include/linux/of.h:15, from /kisskb/src/include/linux/irqdomain.h:35, from /kisskb/src/include/linux/acpi.h:13, from /kisskb/src/drivers/infiniband/hw/hns/hns_roce_hw_v2.c:33: In function 'modify_qp_init_to_rtr', inlined from 'hns_roce_v2_set_abs_fields' at /kisskb/src/drivers/infiniband/hw/hns/hns_roce_hw_v2.c:4798:9, inlined from 'hns_roce_v2_modify_qp' at /kisskb/src/drivers/infiniband/hw/hns/hns_roce_hw_v2.c:5001:8: /kisskb/src/include/linux/compiler_types.h:328:38: error: call to '__compiletime_assert_1857' declared with attribute error: FIELD_PREP: value too large for the field _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/uapi/linux/byteorder/little_endian.h:33:51: note: in definition of macro '__cpu_to_le32' #define __cpu_to_le32(x) ((__force __le32)(__u32)(x)) ^ /kisskb/src/include/linux/compiler_types.h:316:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:328:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/bitfield.h:49:3: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(__builtin_constant_p(_val) ? \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/linux/bitfield.h:94:3: note: in expansion of macro '__BF_FIELD_CHECK' __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: "); \ ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/infiniband/hw/hns/hns_roce_common.h:91:52: note: in expansion of macro 'FIELD_PREP' *((__le32 *)ptr + (field_h) / 32) |= cpu_to_le32(FIELD_PREP( \ ^~~~~~~~~~ /kisskb/src/drivers/infiniband/hw/hns/hns_roce_common.h:95:39: note: in expansion of macro '_hr_reg_write' #define hr_reg_write(ptr, field, val) _hr_reg_write(ptr, field, val) ^~~~~~~~~~~~~ /kisskb/src/drivers/infiniband/hw/hns/hns_roce_hw_v2.c:4422:2: note: in expansion of macro 'hr_reg_write' hr_reg_write(context, QPC_LP_PKTN_INI, lp_pktn_ini); ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:328:38: error: call to '__compiletime_assert_1864' declared with attribute error: FIELD_PREP: value too large for the field _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/uapi/linux/byteorder/little_endian.h:33:51: note: in definition of macro '__cpu_to_le32' #define __cpu_to_le32(x) ((__force __le32)(__u32)(x)) ^ /kisskb/src/include/linux/compiler_types.h:316:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:328:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/bitfield.h:49:3: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(__builtin_constant_p(_val) ? \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/linux/bitfield.h:94:3: note: in expansion of macro '__BF_FIELD_CHECK' __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: "); \ ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/infiniband/hw/hns/hns_roce_common.h:91:52: note: in expansion of macro 'FIELD_PREP' *((__le32 *)ptr + (field_h) / 32) |= cpu_to_le32(FIELD_PREP( \ ^~~~~~~~~~ /kisskb/src/drivers/infiniband/hw/hns/hns_roce_common.h:95:39: note: in expansion of macro '_hr_reg_write' #define hr_reg_write(ptr, field, val) _hr_reg_write(ptr, field, val) ^~~~~~~~~~~~~ /kisskb/src/drivers/infiniband/hw/hns/hns_roce_hw_v2.c:4426:2: note: in expansion of macro 'hr_reg_write' hr_reg_write(context, QPC_ACK_REQ_FREQ, lp_pktn_ini); ^~~~~~~~~~~~ make[5]: *** [/kisskb/src/scripts/Makefile.build:273: drivers/infiniband/hw/hns/hns_roce_hw_v2.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/infiniband/hw/hns] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/infiniband/hw] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/infiniband] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1847: drivers] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 120 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_arm64-allmodconfig_arm64-gcc8 # Build took: 0:14:48.690948