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 1747CC54EBD for ; Mon, 9 Jan 2023 22:44:32 +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=5w0zaOGk612Xhu8xUHWfMfRZCWbHAmFCe5FA1mhRTzo=; b=jxR pcr79r6hCcbC+Ba52cG928Lu3ILhSCi/w2MwXE/R+cJ7UghMGbN/s2rg+x9JG9jajM0H/nJZsqTg9 d/HgPLIRdKxPgAFpcw5HyfqUeCD9VJ16x7/ovVak855io/yqMPNjteLXfWtdQrxjEKG/oHtVl0Z7d SAFJ0RtUf9GbqfRbXi1lsf431PRrN/wtv4alW2BfoBzpHMsVcXjTUqmRAIsag46Yws0HQ/clrX8XD XHyoKDTa6F+0AvuqS/E4pPmk5VBvujdT9EiW52tcHBTBV4hUR4Rb/ix+AiFIJG2YNcmq1UsFtvf0x LrV+2F3KXgthgsB3mjvKew9OY5O9NJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pF0rP-004Wpn-B8; Mon, 09 Jan 2023 22:43:19 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pF0rL-004WnF-Pf for linux-arm-kernel@lists.infradead.org; Mon, 09 Jan 2023 22:43:17 +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 4NrTVH4jN9z4xND; Tue, 10 Jan 2023 09:42:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1673304171; bh=7DWiRV4Q8QRPF+LkxUekuAC1Y3rOnAapGW2ZUhPDazc=; h=Date:From:To:Cc:Subject:From; b=jPZAuhG6Q8tIhNIKwTjfEZzNYrg62mhClnT5xWVHU4s1dpekt/G49cn9WPuTzUOUg m0mCMScACPVRU49PlzXhRrKKIZgk/akXvI13+HVnnGkhRMXVM94NgNAP+TxTrjM69C VMNwrx5RuneoiGlQ/sKKa7TzbkO1C608GVa1ie3+VKokGi+xeFC44X7PS6Z4NnZcau lLT6L44PLmR385Zt32eI9BiN7FPktG03fTgetyjPs0m+K/1aarFixU1IMnnK8ZfGkq RbHcIthg7lYOjlTPHV0RBChzmIfCFAws9cIR+Cu6GWsMR6LleWknMvGP+8bw/xMgd3 y/KbQlT7mcrpw== Date: Tue, 10 Jan 2023 09:42:46 +1100 From: Stephen Rothwell To: Bartosz Golaszewski , Olof Johansson , Arnd Bergmann Cc: ARM , Bartosz Golaszewski , Jilin Yuan , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the davinci tree with the arm-soc tree Message-ID: <20230110094246.1497d12e@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230109_144316_189537_2393F5C7 X-CRM114-Status: GOOD ( 15.34 ) 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="===============1396031736054187027==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============1396031736054187027== Content-Type: multipart/signed; boundary="Sig_/UX9MyVrSXCmEHSFeNun/8Nf"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/UX9MyVrSXCmEHSFeNun/8Nf Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the davinci tree got a conflict in: arch/arm/mach-davinci/board-dm365-evm.c between commit: fef6ca600ba7 ("ARM: davinci: remove unused board support") from the arm-soc tree and commit: 84bde55c050b ("ARM: davinci: fix repeated words in comments") from the davinci tree. I fixed it up (I removed the file) 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_/UX9MyVrSXCmEHSFeNun/8Nf Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmO8mGYACgkQAVBC80lX 0GyBzwf+MrEGJvgsywvPzzoCE37N7+H9UpELbyC59ORp+P+lx+bgM2XX/f8RMlDl S12t59Sl2OaA4zpvj7EmiMy/o9M7bcV8DxdgOwWJmqis0nbxNlkqICgs6xays8Go /0GZW68ZcG4J7GZo5GSdVdakiF8lTgbzi0va6gVn/dv7cU1TOu+NZO/SS7xJleaG IyFxC0h0ubN2xutH0JkOvxiEjUAVMFlBxm3NTEilphlG6MxsuJsIKjNfVEiPusyA AlmX48QgOVQq7XyPmN4aUXS0WqV+Or5LLHb90fUJe6NHmrQhqqrxI4MeEKytAmuW BuKToJEQHzMwZbmgDI2d81paR4zFZw== =sCXs -----END PGP SIGNATURE----- --Sig_/UX9MyVrSXCmEHSFeNun/8Nf-- --===============1396031736054187027== 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 --===============1396031736054187027==--