From: Dave Airlie <airlied@redhat.com>
Date: Mon, 1 May 2017 18:46:01 +0000 (+1000)
Subject: Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next
X-Git-Tag: v4.12-rc1~116^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b03d1ed2c43a2ba5ef3381322ee4515b97381bf;p=thirdparty%2Fkernel%2Fstable.git

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

Some nouveau regression fixes.

* 'linux-4.12' of git://github.com/skeggsb/linux:
  drm/nouveau/fb/gf100-: Fix 32 bit wraparound in new ram detection
  drm/nouveau/secboot/gm20b: fix the error return code in gm20b_secboot_tegra_read_wpr()
  drm/nouveau/kms: Increase max retries in scanout position queries.
  drm/nouveau/bios/bitP: check that table is long enough for optional pointers
  drm/nouveau/fifo/nv40: no ctxsw for pre-nv44 mpeg engine
---

8b03d1ed2c43a2ba5ef3381322ee4515b97381bf