From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CCF7C433FE for ; Fri, 18 Mar 2022 07:44:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233169AbiCRHpn (ORCPT ); Fri, 18 Mar 2022 03:45:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231844AbiCRHpm (ORCPT ); Fri, 18 Mar 2022 03:45:42 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 796A51F42C9; Fri, 18 Mar 2022 00:44:23 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4KKbcj5SD7z4xgw; Fri, 18 Mar 2022 18:44:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1647589462; bh=dsXOzAUhSDy56QPmWs67ignbc2RjTXOlVjnzLk0t7Mc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Avnjyr2LyFPke8fhYTv460SMTLoPxkUmqrdI6acLrzVmTYWTO+wASx9mmcyunTwAh MpTqEOffMCUe9zgEOGujGs2YqNDLAJwd0Pnzi0T26qh1Hv5ALgGNEvilo1usuE1nOC LKF3p9AisL3VhdI0QN2z1Dt8vmGuWMDRDZGV32UR4eeLXQZ4muMT9kzCdAiJpvc75x Ujdf03AhSYHBuhfUaYb9j/LKbjXPce++l6OwoEZS1ziI++fqyQwPFSqySf0fOm/J9p 2uIiwXg4nI1bv3YnvtboHO5TUCSbt9WpYdznJGVAyMx7rBmNg90qet9GD0sQUGjBwq LTCC2sK+GBARA== Date: Fri, 18 Mar 2022 18:44:20 +1100 From: Stephen Rothwell 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 Subject: Re: linux-next: manual merge of the qcom tree with the imx-mxs tree Message-ID: <20220318184420.74d10227@canb.auug.org.au> In-Reply-To: <20220214093432.31152d57@canb.auug.org.au> References: <20220214093432.31152d57@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/KjGyJqwnBjB=FlYRastjKI8"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/KjGyJqwnBjB=FlYRastjKI8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 14 Feb 2022 09:34:32 +1100 Stephen Rothwell = wrote: > > Today's linux-next merge of the qcom tree got a conflict in: >=20 > arch/arm64/configs/defconfig >=20 > between commits: >=20 > 6e3807935e18 ("arm64: defconfig: re-order default configuration") > dde8cd786e37 ("arm64: defconfig: rebuild default configuration") >=20 > from the imx-mxs tree and commits: >=20 > cd7ce3e18afa ("arm64: defconfig: Enable SM8250 video clock controller") > 17ef0b4b441f ("arm64: defconfig: enable mcp251xfd driver") >=20 > from the qcom tree. >=20 > 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. >=20 > --=20 > Cheers, > Stephen Rothwell >=20 > 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=3D > CONFIG_ATH10K_PCI=3Dm > CONFIG_ATH10K_SNOC=3Dm > CONFIG_WCN36XX=3Dm > + CONFIG_ATH11K=3Dm > + CONFIG_ATH11K_AHB=3Dm > + CONFIG_ATH11K_PCI=3Dm > CONFIG_BRCMFMAC=3Dm > CONFIG_MWIFIEX=3Dm > +CONFIG_MWIFIEX_SDIO=3Dm > CONFIG_MWIFIEX_PCIE=3Dm > CONFIG_WL18XX=3Dm > CONFIG_WLCORE_SDIO=3Dm > @@@ -602,9 -607,9 +608,10 @@@ CONFIG_IMX_SC_WDT=3D > CONFIG_QCOM_WDT=3Dm > CONFIG_MESON_GXBB_WATCHDOG=3Dm > CONFIG_MESON_WATCHDOG=3Dm > +CONFIG_ARM_SMC_WATCHDOG=3Dy > CONFIG_RENESAS_WDT=3Dy > CONFIG_UNIPHIER_WATCHDOG=3Dy > + CONFIG_PM8916_WATCHDOG=3Dm > CONFIG_BCM2835_WDT=3Dy > CONFIG_MFD_ALTERA_SYSMGR=3Dy > CONFIG_MFD_BD9571MWV=3Dy > @@@ -1009,6 -1021,10 +1016,7 @@@ CONFIG_SDM_DISPCC_845=3D > CONFIG_SM_GCC_8350=3Dy > CONFIG_SM_GPUCC_8150=3Dy > CONFIG_SM_GPUCC_8250=3Dy > -CONFIG_SM_DISPCC_8250=3Dy > + CONFIG_SM_VIDEOCC_8250=3Dy > CONFIG_QCOM_HFPLL=3Dy > CONFIG_CLK_GFM_LPASS_SM8250=3Dm > CONFIG_CLK_RCAR_USB2_CLOCK_SEL=3Dy > @@@ -1042,11 -1058,10 +1050,12 @@@ CONFIG_RASPBERRYPI_POWER=3D > CONFIG_FSL_DPAA=3Dy > CONFIG_FSL_MC_DPIO=3Dy > CONFIG_FSL_RCPM=3Dy > +CONFIG_MTK_DEVAPC=3Dm > CONFIG_MTK_PMIC_WRAP=3Dy > + CONFIG_MAILBOX=3Dy > CONFIG_QCOM_AOSS_QMP=3Dy > CONFIG_QCOM_COMMAND_DB=3Dy > +CONFIG_QCOM_CPR=3Dy > CONFIG_QCOM_GENI_SE=3Dy > CONFIG_QCOM_RMTFS_MEM=3Dm > CONFIG_QCOM_RPMH=3Dy This is now a conflict between the qcom tree and the arm-soc tree. --=20 Cheers, Stephen Rothwell --Sig_/KjGyJqwnBjB=FlYRastjKI8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmI0OFUACgkQAVBC80lX 0GxdFQf/YBH5t4Ph9WhcCA2CfidDsPZdFp8cFtQB/neuM0CoEDsfiITeXEiukpG/ l2+66E42sG4VnSeM4s1yRV31dyKAmJot73IaGgNgivHQnW909vJ7XMyG/Ro+zW8o 2yt31FIJQI/RGJ5SdomwQ7/+KSFbMP6kCFbcWrMzH95XMJ+XJZdSTnT9DuojEQiK FI4i9bYkATKxFtyv+OLzGOSwMsEOY9k6Sd9AN2IrnhkTyQqrUKiYerj1cTKEUjXl eYWpSW4sH/euwln1Kr1M8T/IZzsU3QiDaBqVxFY1PnPi/UykYeSrOWMk1DkZ5dok MGOFdZEwo1U8tIAdaU0gsVZ+bakKPQ== =c1qE -----END PGP SIGNATURE----- --Sig_/KjGyJqwnBjB=FlYRastjKI8--