linux-kernel - linux-next: manual merge of the qcom tree with the imx-mxs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220214093432.31152d57@canb.auug.org.au>
Date:   Mon, 14 Feb 2022 09:34:32 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andy Gross <agross@...nel.org>, Shawn Guo <shawnguo@...nel.org>
Cc:     Bjorn Andersson <bjorn.andersson@...aro.org>,
        Bryan O'Donoghue <bryan.odonoghue@...aro.org>,
        Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Marcel Ziswiler <marcel.ziswiler@...adex.com>
Subject: linux-next: manual merge of the qcom tree with the imx-mxs tree

Hi all,

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

  arch/arm64/configs/defconfig

between commits:

  6e3807935e18 ("arm64: defconfig: re-order default configuration")
  dde8cd786e37 ("arm64: defconfig: rebuild default configuration")

from the imx-mxs tree and commits:

  cd7ce3e18afa ("arm64: defconfig: Enable SM8250 video clock controller")
  17ef0b4b441f ("arm64: defconfig: enable mcp251xfd driver")

from the qcom 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 2bb7765e5d82,bbe40f0fd620..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -383,9 -383,11 +385,12 @@@ CONFIG_ATH10K=
  CONFIG_ATH10K_PCI=m
  CONFIG_ATH10K_SNOC=m
  CONFIG_WCN36XX=m
+ CONFIG_ATH11K=m
+ CONFIG_ATH11K_AHB=m
+ CONFIG_ATH11K_PCI=m
  CONFIG_BRCMFMAC=m
  CONFIG_MWIFIEX=m
 +CONFIG_MWIFIEX_SDIO=m
  CONFIG_MWIFIEX_PCIE=m
  CONFIG_WL18XX=m
  CONFIG_WLCORE_SDIO=m
@@@ -602,9 -607,9 +608,10 @@@ CONFIG_IMX_SC_WDT=
  CONFIG_QCOM_WDT=m
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
 +CONFIG_ARM_SMC_WATCHDOG=y
  CONFIG_RENESAS_WDT=y
  CONFIG_UNIPHIER_WATCHDOG=y
+ CONFIG_PM8916_WATCHDOG=m
  CONFIG_BCM2835_WDT=y
  CONFIG_MFD_ALTERA_SYSMGR=y
  CONFIG_MFD_BD9571MWV=y
@@@ -1009,6 -1021,10 +1016,7 @@@ CONFIG_SDM_DISPCC_845=
  CONFIG_SM_GCC_8350=y
  CONFIG_SM_GPUCC_8150=y
  CONFIG_SM_GPUCC_8250=y
 -CONFIG_SM_DISPCC_8250=y
+ CONFIG_SM_VIDEOCC_8250=y
  CONFIG_QCOM_HFPLL=y
  CONFIG_CLK_GFM_LPASS_SM8250=m
  CONFIG_CLK_RCAR_USB2_CLOCK_SEL=y
@@@ -1042,11 -1058,10 +1050,12 @@@ CONFIG_RASPBERRYPI_POWER=
  CONFIG_FSL_DPAA=y
  CONFIG_FSL_MC_DPIO=y
  CONFIG_FSL_RCPM=y
 +CONFIG_MTK_DEVAPC=m
  CONFIG_MTK_PMIC_WRAP=y
+ CONFIG_MAILBOX=y
  CONFIG_QCOM_AOSS_QMP=y
  CONFIG_QCOM_COMMAND_DB=y
 +CONFIG_QCOM_CPR=y
  CONFIG_QCOM_GENI_SE=y
  CONFIG_QCOM_RMTFS_MEM=m
  CONFIG_QCOM_RPMH=y

Content of type "application/pgp-signature" skipped