linux-kernel - linux-next: manual merge of the devicetree tree with Linus' and the drm, arm-soc trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Tue, 22 Jun 2021 13:24:34 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>,
        Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Alexandre Torgue <alexandre.torgue@...s.st.com>,
        Fabrizio Castro <fabrizio.castro.jz@...esas.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Parshuram Thombare <pthombar@...ence.com>,
        Rob Herring <robh@...nel.org>,
        Robert Foss <robert.foss@...aro.org>
Subject: linux-next: manual merge of the devicetree tree with Linus' and the
 drm, arm-soc trees

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

Content of type "application/pgp-signature" skipped