Re: linux-next: manual merge of the usb tree with the arm-soc tree

2014-07-24 Thread Olof Johansson
On Wed, Jul 23, 2014 at 11:33 PM, 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 o

Re: linux-next: manual merge of the usb tree with the arm-soc tree

2014-07-23 Thread Greg KH
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

Re: linux-next: manual merge of the usb tree with the arm-soc tree

2014-07-23 Thread Stephen Rothwell
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: qc