linux-next: manual merge of the drm-tegra tree with the drm tree

2017-06-15 Thread Stephen Rothwell
Hi Thierry, Today's linux-next merge of the drm-tegra tree got a conflict in: Documentation/gpu/index.rst between commit: bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111") from the drm tree and commit: fa6d095eb23a ("drm/tegra: Add driver documentation") from the drm-tegra t

Re: linux-next: manual merge of the drm-tegra tree with the drm tree

2017-03-21 Thread Thierry Reding
On Tue, Mar 21, 2017 at 11:45:45AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-tegra tree got a conflict in: > > drivers/gpu/drm/tegra/drm.c > > between commit: > > 10437d9b475e ("drm: tegra: use vblank hooks in struct drm_crtc_funcs") > > from the drm

linux-next: manual merge of the drm-tegra tree with the drm tree

2017-03-20 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-tegra tree got a conflict in: drivers/gpu/drm/tegra/drm.c between commit: 10437d9b475e ("drm: tegra: use vblank hooks in struct drm_crtc_funcs") from the drm tree and commit: 3f2ea8cee24f ("drm/tegra: Don't leak kernel pointer to userspace")