linux-kernel - linux-next: manual merge of the usb tree with the samsung 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: <20140724163834.430cf674@canb.auug.org.au>
Date:	Thu, 24 Jul 2014 16:38:34 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mateusz Krawczuk <mat.krawczuk@...il.com>,
	Marek Szyprowski <m.szyprowski@...sung.com>,
	Kishon Vijay Abraham I <kishon@...com>
Subject: linux-next: manual merge of the usb tree with the samsung tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/phy/phy-samsung-usb2.c between commit 949ccc3a9363 ("phy: Add
support for S5PV210 to the Exynos USB 2.0 PHY driver") from the samsung
tree and commit 016e0d3cb72c ("drivers: phy: exynos-usb2: add support
for Exynos 3250") from the usb tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/phy/phy-samsung-usb2.c
index 29e4ab987645,ae30640a411d..000000000000
--- a/drivers/phy/phy-samsung-usb2.c
+++ b/drivers/phy/phy-samsung-usb2.c
@@@ -87,12 -87,12 +87,18 @@@ static struct phy *samsung_usb2_phy_xla
  }
  
  static const struct of_device_id samsung_usb2_phy_of_match[] = {
 +#ifdef CONFIG_PHY_S5PV210_USB2
 +	{
 +		.compatible = "samsung,s5pv210-usb2-phy",
 +		.data = &s5pv210_usb2_phy_config,
 +	},
 +#endif
+ #ifdef CONFIG_PHY_EXYNOS4X12_USB2
+ 	{
+ 		.compatible = "samsung,exynos3250-usb2-phy",
+ 		.data = &exynos3250_usb2_phy_config,
+ 	},
+ #endif
  #ifdef CONFIG_PHY_EXYNOS4210_USB2
  	{
  		.compatible = "samsung,exynos4210-usb2-phy",

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)