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

2024-05-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml between commit: 90ed42ceda76 ("dt-bindings: display: novatek, nt36523: define ports") from the drm tree and commit: 9fa6bcf23e44 ("dt-bindings:

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

2020-08-05 Thread Stephen Rothwell
Hi all, On Wed, 22 Jul 2020 15:52:39 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt > > between commit: > > 5a2e9b658cdc ("dt-bindings: drm/bridge: ti-sn65dsi86: Con

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

2020-07-21 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt between commit: 5a2e9b658cdc ("dt-bindings: drm/bridge: ti-sn65dsi86: Convert to yaml") from the drm tree and commit: 382646090f7f ("dt-bindings:

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

2020-05-03 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/display/panel/panel-common.yaml between commit: 92e513fb0798 ("dt-bindings: display: grammar fixes in panel/") from the drm tree and commit: 3d21a4609335 ("dt-bindings: Remove ca

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

2017-11-19 Thread Daniel Vetter
On Mon, Nov 13, 2017 at 09:51:29PM +0200, Jyri Sarha wrote: > On 11/13/17 20:43, Frank Rowand wrote: > > Hi Jyri, > > > > On 11/13/17 07:40, Jyri Sarha wrote: > >> On 11/13/17 07:58, Stephen Rothwell wrote: > >>> Hi all, > >>> > >>> On Mon, 30 Oct 2017 20:37:56 + Mark Brown wrote: > Toda

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

2017-11-14 Thread Frank Rowand
Hi Jyri, On 11/13/17 07:40, Jyri Sarha wrote: > On 11/13/17 07:58, Stephen Rothwell wrote: >> Hi all, >> >> On Mon, 30 Oct 2017 20:37:56 + Mark Brown wrote: >>> >>> Today's linux-next merge of the devicetree tree got a conflict in: >>> >>> drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c >>> >>

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

2017-11-13 Thread Jyri Sarha
On 11/13/17 20:43, Frank Rowand wrote: > Hi Jyri, > > On 11/13/17 07:40, Jyri Sarha wrote: >> On 11/13/17 07:58, Stephen Rothwell wrote: >>> Hi all, >>> >>> On Mon, 30 Oct 2017 20:37:56 + Mark Brown wrote: Today's linux-next merge of the devicetree tree got a conflict in: dri

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

2017-11-13 Thread Jyri Sarha
On 11/13/17 07:58, Stephen Rothwell wrote: > Hi all, > > On Mon, 30 Oct 2017 20:37:56 + Mark Brown wrote: >> >> Today's linux-next merge of the devicetree tree got a conflict in: >> >> drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c >> >> between commit: >> >> 44cd3939c111b7 ("drm/tilcdc: Re

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

2017-11-12 Thread Stephen Rothwell
Hi all, On Mon, 30 Oct 2017 20:37:56 + Mark Brown wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: > > drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c > > between commit: > > 44cd3939c111b7 ("drm/tilcdc: Remove redundant OF_DETACHED flag setting") > > from th