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:
pgpkmhWFx4SEh.pgp
Description: OpenPGP digital signature