linux-kernel - linux-next: manual merge of the phy-next 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>] [day] [month] [year] [list]

Message-ID: <20200107142415.4a35fcdb@canb.auug.org.au>
Date:   Tue, 7 Jan 2020 14:24:15 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kishon Vijay Abraham I <kishon@...com>, Greg KH <greg@...ah.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Krzysztof Kozlowski <krzk@...nel.org>
Subject: linux-next: manual merge of the phy-next tree with the usb tree

Hi all,

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

  drivers/phy/mediatek/Kconfig

between commit:

  203b7ee14d3a ("phy: Enable compile testing for some of drivers")

from the usb tree and commits:

  6ee054e3a2e9 ("phy: mediatek: Fix Kconfig indentation")
  1544133d48c3 ("phy: Enable compile testing for some of drivers")

from the phy-next tree.

I fixed it up (I just used the latter version of the 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