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

[Stephen Rothwell]

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  85d81e15862a ("arm64: defconfig: Enable DisplayPort on SC8280XP laptops")

from the qcom tree and commit:

  1f6d59f7f82d ("arm64: defconfig: Enable UCSI support")

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 arch/arm64/configs/defconfig
index 989183c76ae0,7eb5b6df594e..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -936,8 -922,8 +936,9 @@@ CONFIG_USB_SERIAL=
  CONFIG_USB_SERIAL_CP210X=m
  CONFIG_USB_SERIAL_FTDI_SIO=m
  CONFIG_USB_SERIAL_OPTION=m
 +CONFIG_USB_QCOM_EUD=m
  CONFIG_USB_HSIC_USB3503=y
+ CONFIG_USB_ONBOARD_HUB=m
  CONFIG_NOP_USB_XCEIV=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
@@@ -960,7 -946,8 +961,9 @@@ CONFIG_TYPEC_TCPCI=
  CONFIG_TYPEC_FUSB302=m
  CONFIG_TYPEC_TPS6598X=m
  CONFIG_TYPEC_HD3SS3220=m
 +CONFIG_TYPEC_MUX_GPIO_SBU=m
+ CONFIG_TYPEC_UCSI=m
+ CONFIG_UCSI_CCG=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y

Attachment: pgp7kscjzcL0l.pgp
Description: OpenPGP digital signature