From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Herring <robherring2@gmail•com>,
Dave Airlie <airlied@linux•ie>,
DRI <dri-devel@lists•freedesktop.org>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>
Cc: Alexandre Torgue <alexandre.torgue@foss•st.com>,
Fabrizio Castro <fabrizio.castro.jz@renesas•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Parshuram Thombare <pthombar@cadence•com>,
Rob Herring <robh@kernel•org>,
Robert Foss <robert.foss@linaro•org>
Subject: linux-next: manual merge of the devicetree tree with Linus' and the drm, arm-soc trees
Date: Tue, 22 Jun 2021 13:24:34 +1000 [thread overview]
Message-ID: <20210622132434.55d19766@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1150 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got conflicts in:
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml
Documentation/devicetree/bindings/media/renesas,drif.yaml
Documentation/devicetree/bindings/net/stm32-dwmac.yaml
between commits:
7169d082e7e6 ("dt-bindings: drm/bridge: MHDP8546 bridge binding changes for HDCP")
8929ef8d4dfd ("media: dt-bindings: media: renesas,drif: Fix fck definition")
fea998229140 ("dt-bindings: net: document ptp_ref clk in dwmac")
from Linus' and the drm, arm-soc trees and commit:
972d6a7dcec3 ("dt-bindings: Drop redundant minItems/maxItems")
from the devicetree tree.
I fixed it up (I used one side or the other, please check when
linux-next is released) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2021-06-22 3:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210622132434.55d19766@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=alexandre.torgue@foss$(echo .)st.com \
--cc=arnd@arndb$(echo .)de \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=fabrizio.castro.jz@renesas$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=pthombar@cadence$(echo .)com \
--cc=robert.foss@linaro$(echo .)org \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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