linux-next: manual merge of the drm tree with the v4l-dvb tree

2017-04-10 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/exynos/exynos_hdmi.c between commit: 278c811c5d05 ("[media] exynos_hdmi: add CEC notifier support") from the v4l-dvb tree and commit: 64b0e1d6c6a1 ("drm: exynos: use vblank hooks in struct drm_crtc_funcs

linux-next: manual merge of the drm tree with the v4l-dvb tree

2016-07-18 Thread Stephen Rothwell
Hi Dave, Today's linux-next merge of the drm tree got a conflict in: Documentation/index.rst between commits: d26a5d4350fd ("[media] doc-rst: Convert media API to rst") 651af5e464ec ("[media] add DVB documentation to Sphinx") from the v4l-dvb tree and commit: cb597fcea5c2 ("Documentat

linux-next: manual merge of the drm tree with the v4l-dvb tree

2016-07-12 Thread Stephen Rothwell
Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/media/platform/omap/omap_voutdef.h between commit: 77430f0396af ("[media] omap_vout: use control framework") from the v4l-dvb tree and commit: 781a162244a2 ("[media] omap_vout: Switch to use the video/omapfb_ds

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

2015-04-17 Thread Philipp Zabel
Am Freitag, den 17.04.2015, 04:07 +0100 schrieb Dave Airlie: > > Am Mittwoch, den 15.04.2015, 13:33 +1000 schrieb Stephen Rothwell: > > > Hi Dave, > > > > > > Today's linux-next merge of the drm tree got a conflict in > > > Documentation/DocBook/media/v4l/subdev-formats.xml between commit > > > 7b

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

2015-04-16 Thread Dave Airlie
> Am Mittwoch, den 15.04.2015, 13:33 +1000 schrieb Stephen Rothwell: > > Hi Dave, > > > > Today's linux-next merge of the drm tree got a conflict in > > Documentation/DocBook/media/v4l/subdev-formats.xml between commit > > 7b0fd4568bee ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on > >

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

2015-04-15 Thread Philipp Zabel
Am Mittwoch, den 15.04.2015, 13:33 +1000 schrieb Stephen Rothwell: > Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in > Documentation/DocBook/media/v4l/subdev-formats.xml between commit > 7b0fd4568bee ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on > 24 and 32 bit

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

2015-04-15 Thread Philipp Zabel
Am Mittwoch, den 15.04.2015, 13:49 +1000 schrieb Stephen Rothwell: > Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in > include/uapi/linux/media-bus-format.h between commits 7b0fd4568bee > ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on 24 and 32 bit > busses"), e8

linux-next: manual merge of the drm tree with the v4l-dvb tree

2015-04-14 Thread Stephen Rothwell
Hi Dave, Today's linux-next merge of the drm tree got a conflict in include/uapi/linux/media-bus-format.h between commits 7b0fd4568bee ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on 24 and 32 bit busses"), e8b2d7a565ae ("[media] v4l: Sort YUV formats of v4l2_mbus_pixelcode") and 2dca055

linux-next: manual merge of the drm tree with the v4l-dvb tree

2015-04-14 Thread Stephen Rothwell
Hi Dave, Today's linux-next merge of the drm tree got a conflict in Documentation/DocBook/media/v4l/subdev-formats.xml between commit 7b0fd4568bee ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on 24 and 32 bit busses") and e8b2d7a565ae ("[media] v4l: Sort YUV formats of v4l2_mbus_pixelcod