Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the mediatek tree with the imx-mxs tree
@ 2021-03-31 22:20 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-03-31 22:20 UTC (permalink / raw)
  To: Matthias Brugger, Shawn Guo
  Cc: Enric Balletbo i Serra, Linux Kernel Mailing List,
	Linux Next Mailing List, Michael Walle


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

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

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-31 22:20 linux-next: manual merge of the mediatek tree with the imx-mxs tree Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git