Messages in this thread | ![/](/images/icornerl.gif) | | Date | Tue, 25 Aug 2020 09:32:08 +1000 | From | Stephen Rothwell <> | 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 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 [unhandled content-type:application/pgp-signature] | ![\](/images/icornerr.gif) |