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:
pgpkluwZq3YO_.pgp
Description: OpenPGP digital signature
