linux-kernel - Re: 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20190709101507.3022b02e@canb.auug.org.au>
Date:   Tue, 9 Jul 2019 10:15:07 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Heiner Kallweit <hkallweit1@...il.com>,
        Maxime Ripard <maxime.ripard@...tlin.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the
 net-next tree

Hi all,

On Fri, 28 Jun 2019 14:56:26 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> Today's linux-next merge of the devicetree tree got a conflict in:
> 
>   Documentation/devicetree/bindings/net/ethernet.txt
> 
> between commit:
> 
>   79b647a0c0d5 ("dt-bindings: net: document new usxgmii phy mode")
> 
> from the net-next tree and commit:
> 
>   4e7a33bff7d7 ("dt-bindings: net: Add YAML schemas for the generic Ethernet options")
> 
> from the devicetree tree.
> 
> I fixed it up (the latter seems to include the change made by the former,
> so I just used the latter) 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.

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped