archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Rob Herring <>,
	Dave Airlie <>,
	DRI <>
Cc: Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Douglas Anderson <>,
	Sam Ravnborg <>,
	"Alexander A. Klimov" <>
Subject: linux-next: manual merge of the devicetree tree with the drm tree
Date: Wed, 22 Jul 2020 15:52:39 +1000	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1922 bytes --]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:


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 <>
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 <>
 .../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.

Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2020-07-22  5:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22  5:52 Stephen Rothwell [this message]
2020-08-06  1:48 ` linux-next: manual merge of the devicetree tree with the drm tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-05-04  3:52 Stephen Rothwell
2017-10-30 20:37 Mark Brown
2017-11-13  5:58 ` Stephen Rothwell
2017-11-13 15:40   ` Jyri Sarha
2017-11-13 18:43     ` Frank Rowand
2017-11-13 19:51       ` Jyri Sarha
2017-11-20  7:41         ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).