]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 23 Jul 2020 05:28:05 +0000 (15:28 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 23 Jul 2020 05:28:10 +0000 (15:28 +1000)
Nothing too exciting:
- a cleanup of our clock handling and improved error handling in this
area from Lubomir
- conversion to pin_user_pages for long page references from John
- fixed PM runtime API error handling from Navid

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/d9e2660d71051bf3cab8aa7afc9f62102ac910d9.camel@pengutronix.de
1  2 
drivers/gpu/drm/etnaviv/etnaviv_gem.c

Simple merge