Merge branch 'msm-fixes-v5.13-rc6' into msm-next-redo
authorRob Clark <robdclark@chromium.org>
Wed, 23 Jun 2021 14:32:59 +0000 (07:32 -0700)
committerRob Clark <robdclark@chromium.org>
Wed, 23 Jun 2021 14:32:59 +0000 (07:32 -0700)
Syncing up with -rc6 fixes to avoid conflicts with a660 patches.

Signed-off-by: Rob Clark <robdclark@chromium.org>
1  2 
drivers/gpu/drm/msm/adreno/a6xx_gpu.c
drivers/gpu/drm/msm/msm_gem.c

Simple merge
Simple merge