linux-next: manual merge of the phy-next tree with the samsung-krzk tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  include/linux/soc/samsung/exynos-regs-pmu.h

between commit:

  85863cee8ce0 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")

from the samsung-krzk tree and commit:

  32267c29bc7d ("phy: exynos5-usbdrd: support Exynos USBDRD 3.1 combo phy (HS & SS)")

from the phy-next 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 include/linux/soc/samsung/exynos-regs-pmu.h
index f411c176536d,6765160eaab2..000000000000
--- a/include/linux/soc/samsung/exynos-regs-pmu.h
+++ b/include/linux/soc/samsung/exynos-regs-pmu.h
@@@ -657,8 -657,8 +657,12 @@@
  #define EXYNOS5433_PAD_RETENTION_UFS_OPTION			(0x3268)
  #define EXYNOS5433_PAD_RETENTION_FSYSGENIO_OPTION		(0x32A8)
  
 +/* For Tensor GS101 */
 +#define GS101_SYSIP_DAT0					(0x810)
 +#define GS101_SYSTEM_CONFIGURATION				(0x3A00)
 +
+ /* For GS101 */
+ #define GS101_PHY_CTRL_USB20					0x3eb0
+ #define GS101_PHY_CTRL_USBDP					0x3eb4
+ 
  #endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */

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