Merge 4.17-rc3 into usb-next

This resolves the merge issue with drivers/usb/core/hcd.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/core/hcd.c
index f65c1f287ab3a52272af7ed9d51e41367224ebea,0a42c5df3c0fb3971c538689697dd52644f443dd..1c21955fe7c00736d4a18fc7cff33783137ef60e
--- 1/drivers/usb/core/hcd.c
--- 2/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@@ -2740,11 -2742,35 +2743,15 @@@ int usb_add_hcd(struct usb_hcd *hcd
        int retval;
        struct usb_device *rhdev;
  
 -      if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->skip_phy_initialization) {
 -              struct usb_phy *phy = usb_get_phy_dev(hcd->self.sysdev, 0);
 -
 -              if (IS_ERR(phy)) {
 -                      retval = PTR_ERR(phy);
 -                      if (retval == -EPROBE_DEFER)
 -                              return retval;
 -              } else {
 -                      retval = usb_phy_init(phy);
 -                      if (retval) {
 -                              usb_put_phy(phy);
 -                              return retval;
 -                      }
 -                      hcd->usb_phy = phy;
 -                      hcd->remove_phy = 1;
 -              }
 -      }
 -
        if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) {
-               hcd->phy_roothub = usb_phy_roothub_init(hcd->self.sysdev);
+               hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev);
 -              if (IS_ERR(hcd->phy_roothub)) {
 -                      retval = PTR_ERR(hcd->phy_roothub);
 -                      goto err_phy_roothub_alloc;
 -              }
 +              if (IS_ERR(hcd->phy_roothub))
 +                      return PTR_ERR(hcd->phy_roothub);
  
 -                      goto err_phy_roothub_alloc;
+               retval = usb_phy_roothub_init(hcd->phy_roothub);
+               if (retval)
++                      return retval;
+ 
                retval = usb_phy_roothub_power_on(hcd->phy_roothub);
                if (retval)
                        goto err_usb_phy_roothub_power_on;

diff --cc drivers/usb/core/hub.c
Simple merge