Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the usb tree got conflicts in:

  drivers/usb/host/xhci.c
  drivers/usb/host/xhci.h

between commit:

  23a3b8d5a236 ("xhci: Add update_hub_device override for PCI xHCI hosts")

from the usb.current tree and commit:

  592338dde854 ("xhci: Add hub_control to xhci_driver_overrides")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/host/xhci.c
index 2b280beb0011,748c7158198f..000000000000
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -5516,8 -5502,8 +5516,10 @@@ void xhci_init_driver(struct hc_driver 
  			drv->check_bandwidth = over->check_bandwidth;
  		if (over->reset_bandwidth)
  			drv->reset_bandwidth = over->reset_bandwidth;
 +		if (over->update_hub_device)
 +			drv->update_hub_device = over->update_hub_device;
+ 		if (over->hub_control)
+ 			drv->hub_control = over->hub_control;
  	}
  }
  EXPORT_SYMBOL_GPL(xhci_init_driver);
diff --cc drivers/usb/host/xhci.h
index dcee7f3207ad,f71841812f06..000000000000
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1944,8 -1943,8 +1944,10 @@@ struct xhci_driver_overrides 
  			     struct usb_host_endpoint *ep);
  	int (*check_bandwidth)(struct usb_hcd *, struct usb_device *);
  	void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
 +	int (*update_hub_device)(struct usb_hcd *hcd, struct usb_device *hdev,
 +			    struct usb_tt *tt, gfp_t mem_flags);
+ 	int (*hub_control)(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+ 			   u16 wIndex, char *buf, u16 wLength);
  };
  
  #define	XHCI_CFC_DELAY		10