diff options
author | Dave Airlie <airlied@redhat.com> | 2018-05-25 01:47:56 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-05-25 01:47:56 +0200 |
commit | 4bc6f777952cf2d5b39e0c5a97a18caa743f03b7 (patch) | |
tree | effcb51399ec56c6322d0f0e4d8853d72b92b8c9 /drivers/reset/sti/Kconfig | |
parent | Merge branch 'drm/du/fixes' of git://linuxtv.org/pinchartl/media into drm-fixes (diff) | |
parent | drm/vmwgfx: Schedule an fb dirty update after resume (diff) | |
download | linux-4bc6f777952cf2d5b39e0c5a97a18caa743f03b7.tar.xz linux-4bc6f777952cf2d5b39e0c5a97a18caa743f03b7.zip |
Merge branch 'vmwgfx-fixes-4.17' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Three fixes for vmwgfx. Two are cc'd stable and fix host logging and its
error paths on 32-bit VMs. One is a fix for a hibernate flaw
introduced with the 4.17 merge window.
* 'vmwgfx-fixes-4.17' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Schedule an fb dirty update after resume
drm/vmwgfx: Fix host logging / guestinfo reading error paths
drm/vmwgfx: Fix 32-bit VMW_PORT_HB_[IN|OUT] macros
Diffstat (limited to 'drivers/reset/sti/Kconfig')
0 files changed, 0 insertions, 0 deletions