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

2017-09-04 Thread Greg KH
On Mon, Sep 04, 2017 at 03:51:32PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/phy/Makefile > > between commit: > > 0ab3aa747f26 ("phy: Add an USB PHY driver for the Lantiq SoCs using the RCU > module") > > from the

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

2015-06-05 Thread Greg KH
On Thu, Jun 04, 2015 at 06:39:33PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/phy/Makefile between commit d38dee131827 ("PHY: Add driver for > Pistachio USB2.0 PHY") from the mips tree and commit 0d486806ffd0 ("phy: > add Broa