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.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 57D06C4363A for ; Mon, 26 Oct 2020 12:35:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D30DF223B0 for ; Mon, 26 Oct 2020 12:35:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1775322AbgJZMfo (ORCPT ); Mon, 26 Oct 2020 08:35:44 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:47717 "EHLO wout3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1775314AbgJZMfo (ORCPT ); Mon, 26 Oct 2020 08:35:44 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id B5998938; Mon, 26 Oct 2020 08:35:41 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 26 Oct 2020 08:35:42 -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=OWQatLhFmozM/ZsQcueB5NiYtQA q2onEhmu98hEfdDQ=; b=P4gIx0PIvJEsCvxOVi7F7/26qearzxxjFcnqbOMbfb1 PV/frK/1DFn8ZARl6OFf4rrK42Y/RtVH+MQJgiyRxcxerQrf5b0lMEPA5m0yYMTB fb4l1vhfAfpiIdLGEXuSeic/jyEKmU2pACHhHkTcEOPRoJMBVd7mT8xwoqeCZQmH /xnjCn0EJKv+ObzWPPug8EE/N9mGr+vceDucaBzHDyGZK1iMn4Kx7ABROnYiboRU nUoyfgWPxoQxhp571W/a7mXaNc2wgHeccK4ILyUr2YGx/RzKz3iXQsa6DXHtME6O kWMGa2ebO6JrxCyx7fSpGSy441tpYhX6c7buoX1kSGQ== 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=OWQatL hFmozM/ZsQcueB5NiYtQAq2onEhmu98hEfdDQ=; b=IPO7MiHN7OQGLjXrrQcRw/ CosF649E0keB+bSJh7esRytApOfRzVM/TKkBiaMkMHApVCm4GWuZcIgGWxIaQgOF Iy5x23d2x9bgzczs8CDXCNvcyTcF/ThbIeg+EDBRjHonhvaqzZXntMcgBy+awA+1 pK4iVpqTjrcwnJ0iEsfozvGKdL5W5FwFiybu8FSfJp42w+cwP6Q05+5fmIbcA0rW ase1RInF19UItMSec5//3rHbvDQNb3eLXzWDTBjz+HafA1wQV04Z+HcOzBMb6s5x ykFa1MF++mKdy5OqmhO5/lFwHdMxVZYEDO66oZeU5nFNJqhYX1cyYtfH4DxYLa6g == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeejgddthecutefuodetggdotefrodftvf 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 48468328005E; Mon, 26 Oct 2020 08:35:37 -0400 (EDT) Date: Mon, 26 Oct 2020 13:35:35 +0100 From: Maxime Ripard To: Stephen Rothwell Cc: Chen-Yu Tsai , Olof Johansson , Arnd Bergmann , ARM , Linux Kernel Mailing List , Linux Next Mailing List , Yangtao Li Subject: Re: linux-next: manual merge of the sunxi tree with the arm-soc tree Message-ID: <20201026123535.7p7scuadh2x5wo4s@gilmour.lan> References: <20201006145637.57d20ba1@canb.auug.org.au> <20201008132017.ju5ih5prn4aifeml@gilmour.lan> <20201026085421.1536d873@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7t2wl4q3lqyl7ybn" Content-Disposition: inline In-Reply-To: <20201026085421.1536d873@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --7t2wl4q3lqyl7ybn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Mon, Oct 26, 2020 at 08:54:21AM +1100, Stephen Rothwell wrote: > On Thu, 8 Oct 2020 15:20:17 +0200 Maxime Ripard wrote: > > > > 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 A1= 00 DTSI file") > > >=20 > > > from the arm-soc tree and commit: > > >=20 > > > 7e66a778cb8b ("arm64: allwinner: A100: add the basical Allwinner A1= 00 DTSI 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 > > 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 > >=20 > > Once that PR is in arm-soc, I guess that merge issue will go away >=20 > I am still getting the same conflict (but between Linus' tree and the > sunxi tree). It looks like the sunxi tree has not been updated since > October 6 ... Yeah, the PR has never been picked up by arm-soc. I've pushed a new branch based on 5.10-rc1 on our repo, it should solve the conflict. Sorry for the inconvenience Maxime --7t2wl4q3lqyl7ybn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCX5bClwAKCRDj7w1vZxhR xZ9DAQCQtJoAOb4OFB/Q4a/cWeyETlvXUauWCymo8SNl4099DwEA6WDVdM/znPlW GGiynDekxPX0RkXaGi7sCoVnwfLTxw0= =WdKH -----END PGP SIGNATURE----- --7t2wl4q3lqyl7ybn--