# git rev-parse -q --verify 79c3ba3206c7680027f61fd4e3d6956a4154bf31^{commit} 79c3ba3206c7680027f61fd4e3d6956a4154bf31 already have revision, skipping fetch # git checkout -q -f -B kisskb 79c3ba3206c7680027f61fd4e3d6956a4154bf31 # git clean -qxdf # < git log -1 # commit 79c3ba3206c7680027f61fd4e3d6956a4154bf31 # Merge: d4425649c630 671e2ee5ee21 # Author: Linus Torvalds # Date: Fri Jun 7 17:39:31 2019 -0700 # # Merge tag 'drm-fixes-2019-06-07-1' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "A small bit more lively this week but not majorly so. I'm away in # Japan next week for family holiday, so I'll be pretty disconnected, # I've asked Daniel to do fixes for the week while I'm out. # # The nouveau firmware changes are a bit large, but they address a big # problem where a whole set of boards don't load with the driver, and # the new firmware fixes that, so I think it's worth trying to land it # now. # # core: # - Allow fb changes in async commits (drivers as well) # # udmabuf: # - Unmap scatterlist when unmapping udmabuf # # nouveau: # - firmware loading fixes for secboot firmware on new GPU revision. # # komeda: # - oops, dma mapping and warning fixes # # arm-hdlcd: # - clock fixes # - mode validation fix # # i915: # - Add a missing Icelake workaround # - GVT - DMA map fault fix and enforcement fixes # # amdgpu: # - DCE resume fix # - New raven variation updates" # # * tag 'drm-fixes-2019-06-07-1' of git://anongit.freedesktop.org/drm/drm: (33 commits) # drm/nouveau/secboot/gp10[2467]: support newer FW to fix SEC2 failures on some boards # drm/nouveau/secboot: enable loading of versioned LS PMU/SEC2 ACR msgqueue FW # drm/nouveau/secboot: split out FW version-specific LS function pointers # drm/nouveau/secboot: pass max supported FW version to LS load funcs # drm/nouveau/core: support versioned firmware loading # drm/nouveau/core: pass subdev into nvkm_firmware_get, rather than device # drm/komeda: Potential error pointer dereference # drm/komeda: remove set but not used variable 'kcrtc' # drm/amd/amdgpu: add RLC firmware to support raven1 refresh # drm/amd/powerplay: add set_power_profile_mode for raven1_refresh # drm/amdgpu: fix ring test failure issue during s3 in vce 3.0 (V2) # udmabuf: actually unmap the scatterlist # drm/arm/hdlcd: Allow a bit of clock tolerance # drm/arm/hdlcd: Actually validate CRTC modes # drm/arm/mali-dp: Add a loop around the second set CVAL and try 5 times # drm/komeda: fixing of DMA mapping sg segment warning # drm: don't block fb changes for async plane updates # drm/vc4: fix fb references in async update # drm/msm: fix fb references in async update # drm/amd: fix fb references in async update # ... # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-ld --version # < git log --format=%s --max-count=1 79c3ba3206c7680027f61fd4e3d6956a4154bf31 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- corenet64_smp_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- In file included from /kisskb/src/include/linux/time64.h:5:0, from /kisskb/src/include/linux/restart_block.h:10, from /kisskb/src/include/linux/thread_info.h:13, from /kisskb/src/arch/powerpc/include/asm/ptrace.h:199, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:12, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:14: /kisskb/src/include/linux/math64.h: In function 'mul_u64_u32_div': /kisskb/src/include/linux/math64.h:274:2: error: implicit declaration of function 'do_div' [-Werror=implicit-function-declaration] In file included from /kisskb/src/include/linux/spinlock.h:58:0, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:14: /kisskb/src/include/linux/bottom_half.h: In function '__local_bh_disable_ip': /kisskb/src/include/linux/bottom_half.h:12:2: error: implicit declaration of function '__preempt_count_add' [-Werror=implicit-function-declaration] In file included from /kisskb/src/include/linux/jiffies.h:12:0, from /kisskb/src/include/linux/ktime.h:25, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/workqueue.h:9, from /kisskb/src/include/linux/rhashtable-types.h:15, from /kisskb/src/include/linux/ipc.h:7, from /kisskb/src/include/uapi/linux/sem.h:5, from /kisskb/src/include/linux/sem.h:5, from /kisskb/src/include/linux/compat.h:14, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:14: ./include/generated/timeconst.h: At top level: ./include/generated/timeconst.h:10:5: warning: "HZ" is not defined [-Wundef] ./include/generated/timeconst.h:11:2: error: #error "include/generated/timeconst.h has the wrong HZ value!" In file included from /kisskb/src/include/linux/ktime.h:25:0, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/workqueue.h:9, from /kisskb/src/include/linux/rhashtable-types.h:15, from /kisskb/src/include/linux/ipc.h:7, from /kisskb/src/include/uapi/linux/sem.h:5, from /kisskb/src/include/linux/sem.h:5, from /kisskb/src/include/linux/compat.h:14, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:14: /kisskb/src/include/linux/jiffies.h:21:5: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:23:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:25:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:27:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:29:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:31:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:33:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:35:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:37:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:39:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:42:3: error: #error Invalid value of HZ. /kisskb/src/include/linux/jiffies.h:264:31: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:264:31: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:63:39: error: division by zero in #if /kisskb/src/include/linux/jiffies.h:264:46: warning: "SHIFT_HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:303:5: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:303:44: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:303:42: error: division by zero in #if /kisskb/src/include/linux/jiffies.h:313:7: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h: In function '_msecs_to_jiffies': /kisskb/src/include/linux/jiffies.h:333:6: error: 'HZ' undeclared (first use in this function) /kisskb/src/include/linux/jiffies.h:333:6: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/include/linux/jiffies.h: At top level: /kisskb/src/include/linux/jiffies.h:376:22: warning: "HZ" is not defined [-Wundef] /kisskb/src/include/linux/jiffies.h:376:20: error: division by zero in #if In file included from /kisskb/src/include/linux/sched.h:28:0, from /kisskb/src/include/linux/uaccess.h:5, from /kisskb/src/include/linux/crypto.h:21, from /kisskb/src/include/crypto/hash.h:11, from /kisskb/src/include/linux/uio.h:10, from /kisskb/src/include/linux/socket.h:8, from /kisskb/src/include/linux/compat.h:15, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:14: /kisskb/src/include/linux/signal_types.h:13:2: error: expected specifier-qualifier-list before '__SIGINFO' In file included from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:14:0: /kisskb/src/include/linux/compat.h:324:21: error: 'SIGEV_MAX_SIZE' undeclared here (not in a function) /kisskb/src/include/linux/compat.h:427:16: warning: 'struct sigevent' declared inside parameter list [enabled by default] /kisskb/src/include/linux/compat.h:427:16: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] In file included from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:15:0: /kisskb/src/include/linux/signal.h:27:26: error: unknown type name 'siginfo_t' /kisskb/src/include/linux/signal.h:28:1: error: unknown type name 'siginfo_t' In file included from /kisskb/src/include/linux/mman.h:5:0, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:21: /kisskb/src/include/linux/mm.h: In function 'check_data_rlimit': /kisskb/src/include/linux/mm.h:2353:13: error: 'RLIM_INFINITY' undeclared (first use in this function) In file included from /kisskb/src/include/linux/sched/user.h:8:0, from /kisskb/src/include/linux/cred.h:17, from /kisskb/src/include/linux/seq_file.h:12, from /kisskb/src/include/linux/cgroup.h:18, from /kisskb/src/include/linux/memcontrol.h:13, from /kisskb/src/include/linux/swap.h:9, from /kisskb/src/include/linux/suspend.h:5, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/include/linux/ratelimit.h: In function 'ratelimit_default_init': /kisskb/src/include/linux/ratelimit.h:52:34: error: 'HZ' undeclared (first use in this function) /kisskb/src/include/linux/ratelimit.h:52:2: warning: 'return' with a value, in function returning void [enabled by default] In file included from /kisskb/src/arch/powerpc/kernel/../mm/mmu_decl.h:20:0, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:66: /kisskb/src/arch/powerpc/include/asm/trace.h: In function 'trace_irq_entry': /kisskb/src/arch/powerpc/include/asm/trace.h:29:1: error: implicit declaration of function 'preempt_count' [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:112: arch/powerpc/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1118: prepare0] Error 2 make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc4.6 # Build took: 0:00:05.745226