Merge 4.1-rc7 into usb-next

This resolves a merge issue in musb_core.c and we want the fixes that
were in Linus's tree in this branch as well for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/phy/Kconfig
Simple merge

diff --cc drivers/phy/phy-core.c
Simple merge

diff --cc drivers/phy/phy-rcar-gen2.c
Simple merge

diff --cc drivers/usb/dwc3/core.h
Simple merge

diff --cc drivers/usb/gadget/function/f_fs.c
index e455eeee644428ff38d71b33b1c74a2d5b4ba83b,3507f880eb74294c76ddbc43c3aa153528478f53..45b8c8b338df7a877cebe8ef6743a675c31aa31e
--- 1/drivers/usb/gadget/function/f_fs.c
--- 2/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@@ -3444,16 -3445,12 +3446,17 @@@ static void ffs_closed(struct ffs_data 
  
        ffs_obj->desc_ready = false;
  
-       if (ffs_obj->ffs_closed_callback)
+       if (test_and_clear_bit(FFS_FL_CALL_CLOSED_CALLBACK, &ffs->flags) &&
+           ffs_obj->ffs_closed_callback)
                ffs_obj->ffs_closed_callback(ffs);
  
 -      if (!ffs_obj->opts || ffs_obj->opts->no_configfs
 -          || !ffs_obj->opts->func_inst.group.cg_item.ci_parent)
 +      if (ffs_obj->opts)
 +              opts = ffs_obj->opts;
 +      else
 +              goto done;
 +
 +      if (opts->no_configfs || !opts->func_inst.group.cg_item.ci_parent
 +          || !atomic_read(&opts->func_inst.group.cg_item.ci_kref.refcount))
                goto done;
  
        unregister_gadget_item(ffs_obj->opts->

diff --cc drivers/usb/gadget/udc/s3c2410_udc.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc drivers/usb/host/xhci.h
Simple merge

diff --cc drivers/usb/musb/musb_core.c
index d878aee404bf0a5a56168ebce39819e568cfd5a1,6dca3d794ced6e1948dd5cbb180e708893f7ba83..514a6cdaeff6117e03e040896089d777d0af0019
--- 1/drivers/usb/musb/musb_core.c
--- 2/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@@ -2040,12 -2029,13 +2040,18 @@@ musb_init_controller(struct device *dev
                musb->io.ep_offset = musb_flat_ep_offset;
                musb->io.ep_select = musb_flat_ep_select;
        }
 +      /* And override them with platform specific ops if specified. */
 +      if (musb->ops->ep_offset)
 +              musb->io.ep_offset = musb->ops->ep_offset;
 +      if (musb->ops->ep_select)
 +              musb->io.ep_select = musb->ops->ep_select;
  
+       /* At least tusb6010 has its own offsets */
+       if (musb->ops->ep_offset)
+               musb->io.ep_offset = musb->ops->ep_offset;
+       if (musb->ops->ep_select)
+               musb->io.ep_select = musb->ops->ep_select;
+ 
        if (musb->ops->fifo_mode)
                fifo_mode = musb->ops->fifo_mode;
        else

diff --cc drivers/usb/phy/phy-ab8500-usb.c
Simple merge