linux-kernel - linux-next: manual merge of the devicetree tree with the usb tree

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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240108150026.2c5930a4@canb.auug.org.au>
Date: Mon, 8 Jan 2024 15:00:26 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Rob Herring <robh@...nel.org>, Greg KH <greg@...ah.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Kyle Tso
 <kyletso@...gle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the usb tree

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/connector/usb-connector.yaml

between commit:

  501b15207138 ("dt-bindings: connector: Add child nodes for multiple PD capabilities")

from the usb tree and commit:

  0d3a771610d0 ("dt-bindings: connector: Add child nodes for multiple PD capabilities")

from the devicetree tree.

I fixed it up (I used the former version as there were other changes
in this file in that version) 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