# git rev-parse -q --verify 6f6a73c8b715d595977774d48450a734297ab21f^{commit} 6f6a73c8b715d595977774d48450a734297ab21f already have revision, skipping fetch # git checkout -q -f -B kisskb 6f6a73c8b715d595977774d48450a734297ab21f # git clean -qxdf # < git log -1 # commit 6f6a73c8b715d595977774d48450a734297ab21f # Merge: 612ab8ad6414 20561da3a2e1 # Author: Linus Torvalds # Date: Tue Sep 8 11:16:11 2020 -0700 # # Merge tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "The i915 reverts are going to be a bit of a conflict mess for next, so # I decided to dequeue them now, along with some msm fixes for a ring # corruption issue, that Rob sent over the weekend. # # Summary: # # i915: # - revert gpu relocation changes due to regression # # msm: # - fixes for RPTR corruption issue" # # * tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm: # Revert "drm/i915/gem: Delete unused code" # Revert "drm/i915/gem: Async GPU relocations only" # Revert "drm/i915: Remove i915_gem_object_get_dirty_page()" # drm/msm: Disable the RPTR shadow # drm/msm: Disable preemption on all 5xx targets # drm/msm: Enable expanded apriv support for a650 # drm/msm: Split the a5xx preemption record # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld --version # < git log --format=%s --max-count=1 6f6a73c8b715d595977774d48450a734297ab21f # < make -s -j 8 ARCH=arm O=/kisskb/build/linus_multi_v7_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- multi_v7_defconfig # < make -s -j 8 ARCH=arm O=/kisskb/build/linus_multi_v7_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- help # make -s -j 8 ARCH=arm O=/kisskb/build/linus_multi_v7_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- olddefconfig # make -s -j 8 ARCH=arm O=/kisskb/build/linus_multi_v7_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- /kisskb/src/arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): /soc/apb@d4000000/spi@d4037000: incorrect #address-cells for SPI bus also defined at /kisskb/src/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3 /kisskb/src/arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): /soc/apb@d4000000/spi@d4037000: incorrect #size-cells for SPI bus also defined at /kisskb/src/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dtb: Warning (spi_bus_reg): Failed prerequisite 'spi_bus_bridge' /kisskb/src/arch/arm/crypto/ghash-ce-glue.c: In function 'ghash_do_update': /kisskb/src/arch/arm/crypto/ghash-ce-glue.c:67:44: warning: passing argument 4 of 'pmull_ghash_update_p64' from incompatible pointer type pmull_ghash_update_p64(blocks, dg, src, key->h, head); ^ /kisskb/src/arch/arm/crypto/ghash-ce-glue.c:45:17: note: expected 'const u64 (*)[2]' but argument is of type 'u64 (*)[2]' asmlinkage void pmull_ghash_update_p64(int blocks, u64 dg[], const char *src, ^ /kisskb/src/arch/arm/crypto/ghash-ce-glue.c:69:43: warning: passing argument 4 of 'pmull_ghash_update_p8' from incompatible pointer type pmull_ghash_update_p8(blocks, dg, src, key->h, head); ^ /kisskb/src/arch/arm/crypto/ghash-ce-glue.c:48:17: note: expected 'const u64 (*)[2]' but argument is of type 'u64 (*)[2]' asmlinkage void pmull_ghash_update_p8(int blocks, u64 dg[], const char *src, ^ /kisskb/src/drivers/firmware/qcom_scm-smc.c: In function 'scm_smc_call': /kisskb/src/drivers/firmware/qcom_scm-smc.c:94:9: warning: missing braces around initializer [-Wmissing-braces] struct arm_smccc_args smc = {0}; ^ /kisskb/src/drivers/firmware/qcom_scm-smc.c:94:9: warning: (near initialization for 'smc.args') [-Wmissing-braces] /kisskb/src/drivers/firmware/qcom_scm-legacy.c: In function 'scm_legacy_call': /kisskb/src/drivers/firmware/qcom_scm-legacy.c:139:9: warning: missing braces around initializer [-Wmissing-braces] struct arm_smccc_args smc = {0}; ^ /kisskb/src/drivers/firmware/qcom_scm-legacy.c:139:9: warning: (near initialization for 'smc.args') [-Wmissing-braces] Completed OK # rm -rf /kisskb/build/linus_multi_v7_defconfig_arm-gcc4.9 # Build took: 0:06:20.004848