]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'drm-vc4-next-2015-12-21' of http://github.com/anholt/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 22 Dec 2015 06:19:37 +0000 (16:19 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 22 Dec 2015 06:19:37 +0000 (16:19 +1000)
commit4bc2483fff6191f5197d7a22895676a34b1d3eb6
tree263ae0b69bfd53de3e5a6dd0983cc9eb31ccd1d2
parentae22e4ba92ae135a1e985d3f1c7f035bf4759080
parentefc9a4162efe5c349589cc4197b4d55816508fa1
Merge tag 'drm-vc4-next-2015-12-21' of http://github.com/anholt/linux into drm-next

I've decided to just send this fixes-for-next pull request now, even if
we don't have a patch for the CONFIG_PM_SLEEP build failure reviewed.
If you like my patch for that, I'd be happy to see it applied directly.

This pull request brings in little fixes from Dan Carpenter for the 3D
support added in this -next cycle.

* tag 'drm-vc4-next-2015-12-21' of http://github.com/anholt/linux:
  drm/vc4: fix an error code
  drm/vc4: allocate enough memory in vc4_save_hang_state()
  drm/vc4: copy_to_user() returns the number of bytes remaining