linux-kernel - linux-next: manual merge of the usb tree with the 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]

Date:	Wed, 12 Mar 2014 01:05:25 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Greg KH <greg@...ah.com>,
	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>,
	Kishon Vijay Abraham I <kishon@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the usb tree with the  tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in arch/arm/mach-tegra/Kconfig between commit 06c886a95cbb533 ("phy: mvebu-sata: prepare new Dove DT Kconfig variable") from the USB tree and commit ff1f0018cf66 ("drivers: Enable building of Kirkwood drivers for mach-mvebu") from the mvebu tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc drivers/phy/Kconfig
index 05711ea4fd15,8d3c49cc500f..000000000000
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -24,7 -27,7 +27,7 @@@ config PHY_EXYNOS_MIPI_VIDE

  config PHY_MVEBU_SATA
        def_bool y
-       depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD
 -      depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE
++      depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || MACH_DOVE
        depends on OF
        select GENERIC_PHY

Content of type "application/pgp-signature" skipped