From: Dave Airlie <airlied@redhat.com>
Date: Fri, 19 May 2017 00:21:41 +0000 (+1000)
Subject: Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: Ubuntu-5.10.0-12.13~10269^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e62961262141bd94341ae0dcb75d16a38542cc99;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes

misc nouveau fixes.

* 'linux-4.12' of git://github.com/skeggsb/linux:
  drm/nouveau/fifo/gk104-: Silence a locking warning
  drm/nouveau/secboot: plug memory leak in ls_ucode_img_load_gr() error path
  drm/nouveau: Fix drm poll_helper handling
---

e62961262141bd94341ae0dcb75d16a38542cc99