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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65C8EC4363A for ; Thu, 8 Oct 2020 13:22:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E45A22083B for ; Thu, 8 Oct 2020 13:22:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pqGRmGAY"; dkim=temperror (0-bit key) header.d=cerno.tech header.i=@cerno.tech header.b="FTHJ9hoL"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Tx9WRZH2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E45A22083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject: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:List-Owner; bh=yB2XZ+oHIUBwO4OjU4PU1HZE1MjOwILIqNBpTw+yD9w=; b=pqGRmGAY8MCHlfzecz1QPpms/ ByhFRQE7zwFrOgtd0utrUT1Q3KlovvNbqQNCTv2H0VHXakQVKyv9exHvVukHXsMD0zpUrtzZ09jlF XJ1zfwNQIOoL8Q0jYR5Wjg0hJBgip1SqkdyWD9+mWeULgC8rXNKWz3zEaU1SqmSmB8TWfTFq1jZoP Bcmwhxr/PkPXkx3KIEXDsTONX1CIGX9z+OzI4Y6LFUKffmAipPNmt3bhP/+/irObxCiHaJa5joA+U oQcHGI2pmX/mCXMOYhX/1Eqqaz9MQkoZ3LBqm2lxrBb8SdEGqtS+01MNIWI5lSBJY27oU3hM+6L4C H74gdFBEw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQVqO-0002R0-S8; Thu, 08 Oct 2020 13:20:28 +0000 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQVqM-0002QK-0G for linux-arm-kernel@lists.infradead.org; Thu, 08 Oct 2020 13:20:26 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id A4098CC1; Thu, 8 Oct 2020 09:20:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 08 Oct 2020 09:20:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=+heDfJakzKF+R2u0q1lN7twC7gD CHgtByTX1mOeLU5Q=; b=FTHJ9hoLeLwdWCd9lHDqKhQe6kynAYEnPxEmOKlHPCB rBk1kIKHMFa3vYPD54fnHb4k+uhc2hwYWOqFwQIX3/RASeAa3ntf3VhaQVhfci5V rUa2M6+ysjWfWnUY9obF5WeB8cD2cReuf1mvT/p8F7Gn0fnLs5EH8HGepGb9T1t3 /ufZVuiaSyI9F04lBx1/QFBaMwUyQORv4Gt41GMhAHFN5frwN014Gr0ReRzDwJ0R ++ixgjsrf3/RJxW5vVlPNPbBcfO1lVxIObCKsDDVIbepwSsyrN+Bq2Mp6XdOc0Dt rsFJyPQC3pV1C3kTrrG6gZIXJrxcrT5ihHQiS+ntCeg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=+heDfJ akzKF+R2u0q1lN7twC7gDCHgtByTX1mOeLU5Q=; b=Tx9WRZH2LxOnH9hOCzITms nIGrPyiwDYWv6MWYPQe1rX+zvFnnRC7yWg8tfC17Tld3ItMN1OB0aC5dbKkEENsm Ud9l3oXjiZalmRw6TH+20vAhbfGbRVJ37Qp1Hxy1uz5t7RDNIHobKSXe00vW/sAp dYyWUdrPP5n9JCoXxiLXj1IREerHgiA9p1zj1SmsKeIoBnZUfk7OgCTzlcIX6JGV DTt51YO5kBIZJZDCyFatGrc+95AA4xdvXfCxWPTCravXg3gfT00kYW9A1ejLc2OT 5ny/zY7pYvAoX6AkmruQoigzGpWU79dcYLuw5ZcjXLoQmdhNDygU8Ij02si8eLKA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrgeelgdefiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepofgrgihimhgv ucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrghtth gvrhhnpeelkeeghefhuddtleejgfeljeffheffgfeijefhgfeufefhtdevteegheeiheeg udenucfkphepledtrdekledrieekrdejieenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA id 073E83280063; Thu, 8 Oct 2020 09:20:18 -0400 (EDT) Date: Thu, 8 Oct 2020 15:20:17 +0200 From: Maxime Ripard To: Stephen Rothwell Subject: Re: linux-next: manual merge of the sunxi tree with the arm-soc tree Message-ID: <20201008132017.ju5ih5prn4aifeml@gilmour.lan> References: <20201006145637.57d20ba1@canb.auug.org.au> MIME-Version: 1.0 In-Reply-To: <20201006145637.57d20ba1@canb.auug.org.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201008_092026_161454_D94F8DC9 X-CRM114-Status: GOOD ( 19.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Linux Kernel Mailing List , Chen-Yu Tsai , Linux Next Mailing List , Yangtao Li , Olof Johansson , ARM Content-Type: multipart/mixed; boundary="===============0705486475488241375==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============0705486475488241375== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nar4feg742sntlic" Content-Disposition: inline --nar4feg742sntlic Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Stephen, On Tue, Oct 06, 2020 at 02:56:37PM +1100, Stephen Rothwell wrote: > Hi all, >=20 > Today's linux-next merge of the sunxi tree got a conflict in: >=20 > arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi >=20 > between commit: >=20 > 0dea1794f3b4 ("arm64: allwinner: A100: add the basical Allwinner A100 D= TSI file") >=20 > from the arm-soc tree and commit: >=20 > 7e66a778cb8b ("arm64: allwinner: A100: add the basical Allwinner A100 D= TSI file") >=20 > from the sunxi tree. >=20 > These are 2 versions of the same patch. For now I am just using the > version in the arm-soc tree ... please sort this out. >=20 > I fixed it up (see above) 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. The branch in arm-soc has a build breakage (that doesn't happen in linux-next since the clk tree has the commit to fix it) so I sent a new PR Once that PR is in arm-soc, I guess that merge issue will go away maxime --nar4feg742sntlic Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCX38SEQAKCRDj7w1vZxhR xVH2AP9J/UDmbsh8i7nc+j+/V4LS37nq/ODXBfuJ2roRxTBSNQEAjXoQ9IxrzTUR EmNB3t5eIApr1TCyADosIA54XVBWPgk= =Mq81 -----END PGP SIGNATURE----- --nar4feg742sntlic-- --===============0705486475488241375== 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 --===============0705486475488241375==--