Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Sep 2014 17:09:34 +1000

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-mxs-usb.c between commit 43f3634ff7e2 ("usb: phy:
mxs: add imx6sx support") from the usb.current tree and commit
d0ee68b59e6a ("usb: phy: mxs: Add VF610 USB PHY support") from the
usb-gadget tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/usb/phy/phy-mxs-usb.c
index 00972eca04e7,8c2f23b75d6d..000000000000
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@@ -125,13 -125,12 +125,18 @@@ static const struct mxs_phy_data imx6sl
  		MXS_PHY_NEED_IP_FIX,
  };
  
 +static const struct mxs_phy_data imx6sx_phy_data = {
 +	.flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
 +		MXS_PHY_NEED_IP_FIX,
 +};
 +
+ static const struct mxs_phy_data vf610_phy_data = {
+ 	.flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
+ 		MXS_PHY_NEED_IP_FIX,
+ };
+ 
  static const struct of_device_id mxs_phy_dt_ids[] = {
 +	{ .compatible = "fsl,imx6sx-usbphy", .data = &imx6sx_phy_data, },
  	{ .compatible = "fsl,imx6sl-usbphy", .data = &imx6sl_phy_data, },
  	{ .compatible = "fsl,imx6q-usbphy", .data = &imx6q_phy_data, },
  	{ .compatible = "fsl,imx23-usbphy", .data = &imx23_phy_data, },