Subject: linux-next: manual merge of the mediatek tree with the imx-mxs tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 1 Apr 2021 09:20:27 +1100

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  94c586e5941a ("arm64: configs: enable FlexTimer alarm timer")

from the imx-mxs tree and commit:

  fbbe38309d56 ("arm64: defconfig: Allow mt8173-based boards to boot from usb")

from the mediatek 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 ec94b0438ab2,f2dc42c9b932..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -996,7 -998,7 +1006,8 @@@ CONFIG_OWL_PM_DOMAINS=
  CONFIG_RASPBERRYPI_POWER=y
  CONFIG_FSL_DPAA=y
  CONFIG_FSL_MC_DPIO=y
 +CONFIG_FSL_RCPM=y
+ CONFIG_MTK_PMIC_WRAP=y
  CONFIG_QCOM_AOSS_QMP=y
  CONFIG_QCOM_COMMAND_DB=y
  CONFIG_QCOM_GENI_SE=y