From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>
Cc: Rob Herring <robherring2@gmail.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Douglas Anderson <dianders@chromium.org>,
Sam Ravnborg <sam@ravnborg.org>,
"Alexander A. Klimov" <grandmaster@al2klimov.de>
Subject: Re: linux-next: manual merge of the devicetree tree with the drm tree
Date: Thu, 6 Aug 2020 11:48:53 +1000 [thread overview]
Message-ID: <20200806114853.43f2e6fb@canb.auug.org.au> (raw)
In-Reply-To: <20200722155239.07bafdfc@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2162 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-08-06 1:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 5:52 linux-next: manual merge of the devicetree tree with the drm tree Stephen Rothwell
2020-08-06 1:48 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-14 4:12 Stephen Rothwell
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200806114853.43f2e6fb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=grandmaster@al2klimov.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robherring2@gmail.com \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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).