linux-next: manual merge of the usb tree with the tegra tree

linux-next: manual merge of the usb tree with the tegra tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]

Hi all,

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

  drivers/usb/host/xhci-tegra.c

between commit:

  5d06652ebfd2 ("usb: xhci-tegra: Add OTG support")

from the tegra tree and commit:

  cbb23d5572f0 ("usb: host: xhci-tegra: Tegra186/Tegra194 LPM")

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-tegra.c
index 32f630b0513e,a6e36b3c968f..000000000000
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@@ -206,7 -203,7 +206,8 @@@ struct tegra_xusb_soc 
  
  	bool scale_ss_clock;
  	bool has_ipfs;
 +	bool otg_reset_sspi;
+ 	bool lpm_support;
  };
  
  struct tegra_xusb_context {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the usb tree with the tegra tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 800 bytes --]

Hi all,

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

  drivers/usb/gadget/udc/tegra-xudc.c

between commit:

  041960cf6937 ("usb: gadget: tegra-xudc: Remove usb-role-switch support")

from the tegra tree and commit:

  bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")

from the usb tree.

I fixed it up (I basically used the tegra tree version) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]