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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Wed, 23 Jul 2014 23:42:18 -0700
From:	Greg KH <>
To:	Stephen Rothwell <>
Cc:	Olof Johansson <>, Arnd Bergmann <>,,,,
	Pratyush Anand <>,
	Viresh Kumar <>,
	Srinivas Kandagatla <>,
	Kishon Vijay Abraham I <>
Subject: Re: linux-next: manual merge of the usb tree with the arm-soc tree

On Thu, Jul 24, 2014 at 04:33:29PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> On Thu, 24 Jul 2014 16:28:11 +1000 Stephen Rothwell <> wrote:
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/phy/Kconfig between commit 64562e99477f ("phy: Add drivers for
> > PCIe and SATA phy on SPEAr13xx") from the arm-soc tree and commit
> > 1de990d8a169 ("phy: qcom: Add driver for QCOM APQ8064 SATA PHY") from
> > the usb tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> Also drivers/phy/Makefile

Both look good, thanks.

greg k-h
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

Powered by blists - more mailing lists