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 07BC7C433EF for ; Tue, 22 Mar 2022 22:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237362AbiCVWFM (ORCPT ); Tue, 22 Mar 2022 18:05:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231234AbiCVWFK (ORCPT ); Tue, 22 Mar 2022 18:05:10 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6FCAE0D7; Tue, 22 Mar 2022 15:03:41 -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 4KNQVL0C9Qz4xNq; Wed, 23 Mar 2022 09:03:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1647986619; bh=uPT3/zjA7Oy0eQTo6UvfmoeIQAREqPSHv4paadqKdHg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=b/eBO9u08DlGAleiYTPJB/xRvEuZ2SYq9SvsgnUuuqYxqVKt5xyTg9WUAg98f7M3d iz3J82jkNoCW9lupPhJnhCVjr2hHe4Dj4Bcd6e2GyTwa7m5KJATp4mpgPETHWTJMXh Yu7UQcIn0rJaYXMEmRqA1rqr3GEqAXSN4/tQCymynIlIBxaQGRF8mDst0I0wDHN3Hv cihZ79c3OXznay6/3/gRl3SyeZ4sC8lsJXwkPEwCDvBQFg4HAa8Sd+OC3LULZNjtt0 rLK18WnjCwbU2Mrob+9A4rcQSq+hiZ2af6zxntXZDCNQzGMuE61+wynDheOAMw0biH H6Aur9hAC2S9Q== Date: Wed, 23 Mar 2022 09:03:37 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann Cc: Mark Brown , ARM , Jonathan Cameron , Linus Walleij , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the spi tree with the arm-soc tree Message-ID: <20220323090337.58419e7f@canb.auug.org.au> In-Reply-To: <20220301143136.7489cab5@canb.auug.org.au> References: <20220301143136.7489cab5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/du7sLH_ou+6ZACh_AHw=f5."; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/du7sLH_ou+6ZACh_AHw=f5. Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 1 Mar 2022 14:31:36 +1100 Stephen Rothwell w= rote: > > Today's linux-next merge of the spi tree got a conflict in: >=20 > arch/arm/mach-pxa/stargate2.c >=20 > between commit: >=20 > 28f74201e37c ("ARM: pxa: remove Intel Imote2 and Stargate 2 boards") >=20 > from the arm-soc tree and commit: >=20 > 31455bbda208 ("spi: pxa2xx_spi: Convert to use GPIO descriptors") >=20 > from the spi tree. >=20 > I fixed it up (I just 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. This is now a conflict between the arm-soc tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/du7sLH_ou+6ZACh_AHw=f5. Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmI6R7kACgkQAVBC80lX 0GyhTAf8CX0lcs9+T4GKxnaVH8Inl5k6sMNjLP3BN7RC77XomXARi4HHHWgnzcrJ pprUxkKvDTdcBnbDyhRxZMFtsMcR8r9/QH3OOH9kFfMl7ZouNbmdtQVB4dx38IJA AZGeV5fACH2blrmDyPrvJMpOxbZIt6gkbiR7vQY2x5Mzw5YcimmO+7MoNXww3lyj kU95uy2S5IuMFrp1J2PkqLMJC1khlTWxyP8XnowPiCRp+bpdMgGCGtChEuSIBIjy GF3orasDljAEdtCl67SE9QwYU3IOnLYxkzeVgbtbqXNlW3luI6S6m0K39aXbg/+M WN2LxiPPiytOzjunocR6rYmiFuP8og== =p6gf -----END PGP SIGNATURE----- --Sig_/du7sLH_ou+6ZACh_AHw=f5.--