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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D7862C433F5 for ; Mon, 31 Jan 2022 22:55:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=mQt0CVrrz2TxIu07ECd7bowxga68vnkf+iiUySjTX/o=; b=McS dTVzas8glTU0ThEGHQu26RQPQhY65xMZyFhmBtWFQR9zOGA79tlYR5GyTGws9bI9DTmuK6OM1S3Qg TI9DUeKzzXkUlMUqtTG9TnTYIE2uAuRXnFn4uhVosTVRU2z9BgujSRaViMcHn9HJYJXqfQth+Qr5j lqbDwetI7gbUgMBmnAwmCIBEy3LlGFXLHMNu8tW75qg3Mf+36s47oIWTR6AcH92pgIML3aHctSh00 TXQyz0jXU86D5VLptwoidt3ztITGFGgf24zXOZtCcOHzRYHut9dV8rstR9qhnUVRy39WGpzVlmv7O BIFJxCk29g2fmyoCI0Hd+N90ihhv+Rg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nEfYl-00AktX-7Z; Mon, 31 Jan 2022 22:54:07 +0000 Received: from gandalf.ozlabs.org ([2404:9400:2:0:216:3eff:fee2:21ea]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nEfYh-00Aks9-1D for linux-arm-kernel@lists.infradead.org; Mon, 31 Jan 2022 22:54:04 +0000 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 4Jnjz657DWz4xPv; Tue, 1 Feb 2022 09:53:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1643669620; bh=9gWhz0yhkc/z4LzkzxWsYqoYCTPaBiVB9ccKR4Ym6HM=; h=Date:From:To:Cc:Subject:From; b=H/geqBOo539DvaD9OmsiXKM42UIO0ur9xBUllYfsb3xbmckFnPaWE1g7bip2YeeC6 jm6tB4XnxmHt2mG/TdQ5SaUPwlwunOW0C/WiKtEQLeCSjMXERW/DCssLigUhRacmYj tLo2YCkSKUwVlkLfT8NX4abNA5+ctnKDKZ+CHpisSjGhH32/u9CUPj0qDUenrBE6fF GDHDiNHWnlSBH0XIoJ6ojeGiLS/+9C9CBLqLU7ObQMnDF0dY928eAnwLWxE5MyEhmv NVeXKK9cV1gTdJ1A24wk8PoFGUATEc3WS80Kfz+3fHkEp/qV/W6yXTssodfbudBbsB m6eKD315gMLng== Date: Tue, 1 Feb 2022 09:53:38 +1100 From: Stephen Rothwell To: Krzysztof Kozlowski , Olof Johansson , Arnd Bergmann , ARM Cc: Krzysztof Kozlowski , Linux Kernel Mailing List , Linux Next Mailing List , Sam Protsenko Subject: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree Message-ID: <20220201095338.1f3fc49f@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220131_145403_272837_EB53C3DB X-CRM114-Status: GOOD ( 15.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1614119192697649333==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============1614119192697649333== Content-Type: multipart/signed; boundary="Sig_/5x6DU=9L+b_QEWOThRL0CSd"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/5x6DU=9L+b_QEWOThRL0CSd Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the samsung-krzk tree got conflicts in: arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi arch/arm64/boot/dts/exynos/exynos850.dtsi between commit: e3493220fd3e ("arm64: dts: exynos: Add initial Exynos850 SoC support") from the arm-soc tree and commit: bfb3c7fa3950 ("arm64: dts: exynos: Add initial Exynos850 SoC support") from the samsung-krzk tree. I fixed it up (I just used the latter, more recent, version) 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 Cheers, Stephen Rothwell --Sig_/5x6DU=9L+b_QEWOThRL0CSd Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmH4aHIACgkQAVBC80lX 0GzYKQf/bIr0p407Guk6e5B49Xr+3NRH2IlstHPrfFJcXM2H1wNBiUsMurHJyH/M M2DGUlMP6wvQlbIyf3x+/GWNyTVBZaZaghf29CxeBUrTA/fMrE+zPDPpvCbJ4gTX r4pRMkEFnF7yKHCJux9cbi60Fo0pyjHHy3iVxPzQEJn7wO1CJrexsHOs7z4kcgW6 lZhteKASmzifi9tByplF9EoUADPG1PboYyT2trTWgcd4TEmNoh6kxPZPWi1Sjk7o xrEKU/0GpdHHaZ6OCIZcuSJRP64xyaHRdIW+4BmbytmyfkUFHNR1FTGAX4i5wYJ5 Lol1kqHTCPWz9lYpBlWWmzggfFs3Vw== =njcY -----END PGP SIGNATURE----- --Sig_/5x6DU=9L+b_QEWOThRL0CSd-- --===============1614119192697649333== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============1614119192697649333==--