Merge remote-tracking branch 'etnaviv/etnaviv/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 03:36:02 +0000 (13:36 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 03:36:02 +0000 (13:36 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:36:02 +0000 (13:36 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:36:02 +0000 (13:36 +1000)
diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 03:36:02 +0000 (13:36 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 03:36:02 +0000 (13:36 +1000)