# 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/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux-gcc --version # < /opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux-ld --version # < git log --format=%s --max-count=1 f55966571d5eb2876a11e48e798b4592fa1ffbb7 # < make -s -j 32 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- help # make -s -j 32 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- olddefconfig # make -s -j 32 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- /kisskb/src/drivers/gpu/drm/rockchip/cdn-dp-core.c:1126:12: warning: 'cdn_dp_resume' defined but not used [-Wunused-function] static int cdn_dp_resume(struct device *dev) ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from :0:0: /kisskb/src/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c: In function 'ifh_encode_bitfield': /kisskb/src/include/linux/compiler_types.h:328:38: error: call to '__compiletime_assert_418' declared with attribute error: Unsupported width, must be <= 40 _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/linux/compiler_types.h:309:4: note: in definition of macro '__compiletime_assert' 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/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c:28:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(width <= 40, "Unsupported width, must be <= 40"); ^ make[6]: *** [/kisskb/src/scripts/Makefile.build:273: drivers/net/ethernet/microchip/sparx5/sparx5_netdev.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/net/ethernet/microchip/sparx5] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/net/ethernet/microchip] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/net/ethernet] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/net] Error 2 make[1]: *** [/kisskb/src/Makefile:1847: drivers] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 32 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_xtensa-allmodconfig_xtensa # Build took: 0:15:55.377700