From: Dave Airlie <airlied@redhat.com>
Date: Fri, 19 Jan 2018 02:12:31 +0000 (+1000)
Subject: Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ee62249d85a3cc2e5507f6b8b64669ac0acbdb88;p=linux.git

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

Thought I'd try my luck getting one more in:
- Two fixes for Tegra (one is to common code, but our userspace doesn't hit it).
- One for NV5x-class MCPs

* 'linux-4.15' of git://github.com/skeggsb/linux:
  drm/nouveau/mmu/mcp77: fix regressions in stolen memory handling
  drm/nouveau/bar/gk20a: Avoid bar teardown during init
  drm/nouveau/drm/nouveau: Pass the proper arguments to nvif_object_map_handle()
---

ee62249d85a3cc2e5507f6b8b64669ac0acbdb88