All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, Dave Airlie <airlied@redhat.com>
Cc: DRI <dri-devel@lists.freedesktop.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Neil Armstrong <neil.armstrong@linaro.org>
Subject: linux-next: manual merge of the devicetree tree with the drm tree
Date: Tue, 14 May 2024 14:12:29 +1000	[thread overview]
Message-ID: <20240514141229.5553dc13@canb.auug.org.au> (raw)

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

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: display: panel: constrain 'reg' in DSI panels")

from the devicetree tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
index bbeea8cfa5fb,0447ee724947..000000000000
--- a/Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
+++ b/Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
@@@ -34,7 -40,7 +37,6 @@@ properties
    vddio-supply:
      description: regulator that supplies the I/O voltage
  
-   reg: true
 -  ports: true
    rotation: true
    backlight: true
  

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

             reply	other threads:[~2024-05-14  4:12 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-14  4:12 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-07-22  5:52 linux-next: manual merge of the devicetree tree with the drm tree Stephen Rothwell
2020-07-22  5:52 ` Stephen Rothwell
2020-08-06  1:48 ` Stephen Rothwell
2020-08-06  1:48   ` Stephen Rothwell
2020-05-04  3:52 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 15:40     ` Jyri Sarha
2017-11-13 18:43     ` Frank Rowand
2017-11-13 19:51       ` Jyri Sarha
2017-11-13 19:51         ` Jyri Sarha
2017-11-20  7:41         ` Daniel Vetter
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=20240514141229.5553dc13@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@redhat.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=krzysztof.kozlowski@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=neil.armstrong@linaro.org \
    --cc=robh@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.