| Message ID | 20200722155239.07bafdfc@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the devicetree tree with the drm tree | expand |
Hi all, On Wed, 22 Jul 2020 15:52:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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: Convert to yaml") > > from the drm tree and commit: > > 382646090f7f ("dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones") > > from the devicetree tree. > > I fixed it up (I delete the file and adde the following merge fix > patch) and can carry the fix as necessary. This is now fixed as far as > linux-next is concerned, but any non trivial conflicts should be > mentioned to your upstream maintainer when your tree is submitted for > merging. You may also want to consider cooperating with the maintainer > of the conflicting tree to minimise any particularly complex conflicts. > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Wed, 22 Jul 2020 15:47:22 +1000 > Subject: [PATCH] fix for "dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones" > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > .../devicetree/bindings/display/bridge/ti,sn65dsi86.yaml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml > index be10e8cf31e1..f8622bd0f61e 100644 > --- a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml > +++ b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml > @@ -11,7 +11,7 @@ maintainers: > > description: | > The Texas Instruments SN65DSI86 bridge takes MIPI DSI in and outputs eDP. > - http://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf > + https://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf > > properties: > compatible: > -- > 2.27.0 This is now a conflict between the drm tree and Linus' tree.
diff --git a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml index be10e8cf31e1..f8622bd0f61e 100644 --- a/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml +++ b/Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml @@ -11,7 +11,7 @@ maintainers: description: | The Texas Instruments SN65DSI86 bridge takes MIPI DSI in and outputs eDP. - http://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf + https://www.ti.com/general/docs/lit/getliterature.tsp?genericPartNumber=sn65dsi86&fileType=pdf properties: compatible:
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: drm/bridge: Replace HTTP links with HTTPS ones") from the devicetree tree. I fixed it up (I delete the file and adde the following merge fix patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 22 Jul 2020 15:47:22 +1000 Subject: [PATCH] fix for "dt-bindings: drm/bridge: Replace HTTP links with HTTPS ones" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- .../devicetree/bindings/display/bridge/ti,sn65dsi86.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)