* linux-next: manual merge of the qcom tree with the imx-mxs tree
@ 2020-03-16 22:31 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2020-03-16 22:31 UTC (permalink / raw)
To: Andy Gross, Shawn Guo
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Li Yang,
Bjorn Andersson
[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]
Hi all,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
97c1ed02f765 ("arm64: defconfig: Enable PHY devices used on QorIQ boards")
from the imx-mxs tree and commit:
1788e7a93207 ("arm64: defconfig: Enable Qualcomm SDM845 audio configs")
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 8a7e1bea71ba,d74d237498d8..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -792,12 -763,13 +803,14 @@@ CONFIG_QCOM_SYSMON=
CONFIG_RPMSG_QCOM_GLINK_RPM=y
CONFIG_RPMSG_QCOM_GLINK_SMEM=m
CONFIG_RPMSG_QCOM_SMD=y
+ CONFIG_SOUNDWIRE=m
+ CONFIG_SOUNDWIRE_QCOM=m
CONFIG_OWL_PM_DOMAINS=y
CONFIG_RASPBERRYPI_POWER=y
+CONFIG_FSL_DPAA=y
+CONFIG_FSL_MC_DPIO=y
CONFIG_IMX_SCU_SOC=y
CONFIG_QCOM_AOSS_QMP=y
-CONFIG_QCOM_COMMAND_DB=y
CONFIG_QCOM_GENI_SE=y
CONFIG_QCOM_GLINK_SSR=m
CONFIG_QCOM_RMTFS_MEM=m
@@@ -892,7 -866,9 +906,10 @@@ CONFIG_FPGA_REGION=
CONFIG_OF_FPGA_REGION=m
CONFIG_TEE=y
CONFIG_OPTEE=y
+CONFIG_MUX_MMIO=y
+ CONFIG_SLIMBUS=m
+ CONFIG_SLIM_QCOM_CTRL=m
+ CONFIG_SLIM_QCOM_NGD_CTRL=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the qcom tree with the imx-mxs tree
2022-02-13 22:34 Stephen Rothwell
@ 2022-03-18 7:44 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2022-03-18 7:44 UTC (permalink / raw)
To: Andy Gross, Olof Johansson, Arnd Bergmann
Cc: Shawn Guo, Bjorn Andersson, Bryan O'Donoghue,
Dmitry Baryshkov, Linux Kernel Mailing List,
Linux Next Mailing List, Marcel Ziswiler, ARM
[-- Attachment #1: Type: text/plain, Size: 2642 bytes --]
Hi all,
On Mon, 14 Feb 2022 09:34:32 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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
This is now a conflict between the qcom tree and the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the qcom tree with the imx-mxs tree
@ 2022-02-13 22:34 Stephen Rothwell
2022-03-18 7:44 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2022-02-13 22:34 UTC (permalink / raw)
To: Andy Gross, Shawn Guo
Cc: Bjorn Andersson, Bryan O'Donoghue, Dmitry Baryshkov,
Linux Kernel Mailing List, Linux Next Mailing List,
Marcel Ziswiler
[-- Attachment #1: Type: text/plain, Size: 2298 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the qcom tree with the imx-mxs tree
@ 2020-08-24 23:32 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2020-08-24 23:32 UTC (permalink / raw)
To: Andy Gross, Shawn Guo
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Guido Günther, Bjorn Andersson, Vinod Koul
[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]
Hi all,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
0c08ed48c956 ("arm64: defconfig: Enable imx8mq-librem5-devkit display stack")
from the imx-mxs tree and commit:
8a3b3373891c ("arm64: defconfig: Enable Lontium LT9611 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 185904e0c5d5,947d8e0f50b3..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -640,12 -622,11 +640,13 @@@ CONFIG_DRM_MSM=
CONFIG_DRM_TEGRA=m
CONFIG_DRM_PANEL_LVDS=m
CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
+CONFIG_DRM_PANEL_SITRONIX_ST7703=m
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
CONFIG_DRM_DISPLAY_CONNECTOR=m
+ CONFIG_DRM_LONTIUM_LT9611=m
+CONFIG_DRM_NWL_MIPI_DSI=m
CONFIG_DRM_SII902X=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
CONFIG_DRM_THINE_THC63LVD1024=m
CONFIG_DRM_TI_SN65DSI86=m
CONFIG_DRM_I2C_ADV7511=m
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-18 7:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-16 22:31 linux-next: manual merge of the qcom tree with the imx-mxs tree Stephen Rothwell
2020-08-24 23:32 Stephen Rothwell
2022-02-13 22:34 Stephen Rothwell
2022-03-18 7:44 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).