linux-next: manual merge of the drm-msm tree with Linus' tree

2020-09-20 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-msm tree got a conflict in: drivers/gpu/drm/msm/adreno/adreno_gpu.c between commit: df561f6688fe ("treewide: Use fallthrough pseudo-keyword") from Linus' tree and commit: 2fb7487aaf71 ("drm/msm: Get rid of the REG_ADRENO offsets") from the dr

linux-next: manual merge of the drm-msm tree with Linus' tree

2017-10-16 Thread Mark Brown
Hi Rob, Today's linux-next merge of the drm-msm tree got a conflict in: drivers/gpu/drm/msm/msm_gem_submit.c between commit: 06451a3d1d7771 ("drm/msm: fix _NO_IMPLICIT fencing case") from Linus' tree and commit: 642e5ef8c6c496 ("drm/msm: fix _NO_IMPLICIT fencing case") from the drm-msm

linux-next: manual merge of the drm-msm tree with Linus' tree

2017-10-16 Thread Mark Brown
Hi Rob, Today's linux-next merge of the drm-msm tree got a conflict in: drivers/gpu/drm/msm/msm_gpu.c between commit: 6bd6ae2dfc7e09 ("drm/msm: fix error path cleanup") from Linus' tree and commit: 0502a625c2ee0c ("drm/msm: fix error path cleanup") from the drm-msm tree. I fixed it up

linux-next: manual merge of the drm-msm tree with Linus' tree

2016-09-15 Thread Stephen Rothwell
Hi Rob, Today's linux-next merge of the drm-msm tree got a conflict in: drivers/gpu/drm/msm/msm_gem_submit.c between commit: d78d383ab354 ("drm/msm: protect against faults from copy_from_user() in submit ioctl") from Linus' tree and commits: 4cd0945901a6 ("drm/msm: submit support for o