From: Dave Airlie Date: Fri, 12 May 2017 04:25:22 +0000 (+1000) Subject: Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bb57d0411a41f525c88f0ca3cc29936e0b879a1b;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next Quite a few patches, but not much code changed: - Fixes regression from atomic when only the source rect of a plane changes (ie. xrandr --right-of) - Fixes another issue where atomic changed behaviour underneath us, potentially causing laggy cursor position updates - Fixes for a bunch of races in thermal code, which lead to random lockups for a lot of users * 'linux-4.12' of git://github.com/skeggsb/linux: drm/nouveau/therm: remove ineffective workarounds for alarm bugs drm/nouveau/tmr: avoid processing completed alarms when adding a new one drm/nouveau/tmr: fix corruption of the pending list when rescheduling an alarm drm/nouveau/tmr: handle races with hw when updating the next alarm time drm/nouveau/tmr: ack interrupt before processing alarms drm/nouveau/core: fix static checker warning drm/nouveau/fb/ram/gf100-: remove 0x10f200 read drm/nouveau/kms/nv50: skip core channel cursor update on position-only changes drm/nouveau/kms/nv50: fix source-rect-only plane updates drm/nouveau/kms/nv50: remove pointless argument to window atomic_check_acquire() --- bb57d0411a41f525c88f0ca3cc29936e0b879a1b