# git rev-parse -q --verify 9f42f674a89200d4f465a7db6070e079f3c6145f^{commit} 9f42f674a89200d4f465a7db6070e079f3c6145f already have revision, skipping fetch # git checkout -q -f -B kisskb 9f42f674a89200d4f465a7db6070e079f3c6145f # git clean -qxdf # < git log -1 # commit 9f42f674a89200d4f465a7db6070e079f3c6145f # Merge: 7c14e4d6fbdd d8a719059b9d # Author: Linus Torvalds # Date: Thu Jul 22 10:38:19 2021 -0700 # # Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux # # Pull arm64 fixes from Will Deacon: # "A pair of arm64 fixes for -rc3. The straightforward one is a fix to # our firmware calling stub, which accidentally started corrupting the # link register on machines with SVE. Since these machines don't really # exist yet, it wasn't spotted in -next. # # The other fix is a revert-and-a-bit of a patch originally intended to # allow PTE-level huge mappings for the VMAP area on 32-bit PPC 8xx. A # side-effect of this change was that our pXd_set_huge() implementations # could be replaced with generic dummy functions depending on the levels # of page-table being used, which in turn broke the boot if we fail to # create the linear mapping as a result of using these functions to # operate on the pgd. Huge thanks to Michael Ellerman for modifying the # revert so as not to regress PPC 8xx in terms of functionality. # # Anyway, that's the background and it's also available in the commit # message along with Link tags pointing at all of the fun. # # Summary: # # - Fix hang when issuing SMC on SVE-capable system due to # clobbered LR # # - Fix boot failure due to missing block mappings with folded # page-table" # # * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: # Revert "mm/pgtable: add stubs for {pmd/pub}_{set/clear}_huge" # arm64: smccc: Save lr before calling __arm_smccc_sve_check() # < /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 9f42f674a89200d4f465a7db6070e079f3c6145f # < make -s -j 48 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 48 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 48 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 48 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:271: drivers/infiniband/hw/hns/hns_roce_hw_v2.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/infiniband/hw/hns] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/infiniband/hw] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/infiniband] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1842: drivers] Error 2 make: *** [Makefile:220: __sub-make] Error 2 Command 'make -s -j 48 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:26:49.381004