linux-kernel - linux-next: manual merge of the devicetree tree with the net-next 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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 29 Aug 2023 11:50:35 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robh@...nel.org>, David Miller <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>
Cc:     Networking <netdev@...r.kernel.org>,
        Bjorn Helgaas <bhelgaas@...gle.com>,
        Harini Katakam <harini.katakam@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Pranavi Somisetty <pranavi.somisetty@....com>
Subject: linux-next: manual merge of the devicetree tree with the net-next
 tree

Hi all,

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

  Documentation/devicetree/bindings/net/xilinx_gmii2rgmii.txt

between commit:

  c639a708a0b8 ("dt-bindings: net: xilinx_gmii2rgmii: Convert to json schema")

from the net-next tree and commit:

  47aab53331ef ("dt-bindings: Fix typos")

from the devicetree tree.

I fixed it up (the former included the change from the latter, so I just
deleted this file) 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