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 D93F9C4321E for ; Mon, 5 Dec 2022 21:41:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233452AbiLEVlA (ORCPT ); Mon, 5 Dec 2022 16:41:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231160AbiLEVk4 (ORCPT ); Mon, 5 Dec 2022 16:40:56 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4511425EBC; Mon, 5 Dec 2022 13:40:54 -0800 (PST) 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 4NQxmw4Xb3z4wgv; Tue, 6 Dec 2022 08:40:48 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1670276449; bh=bj/9YMHqJCCVv195EGHZoWZDT+Qa0ZVxlDMji/X3sUI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=n9qgymWgpbPoiDk3AJrp3fBYqJASOzUV54DpZcSbc51MZfRHAvb05OQ2bSj+NrTHV sLfIk041B+EWGFvWTV/5yA81M3zDX6u4icfcHdScJfJRwFQSF0RQb2M2TgSDTAj7xT xNcq+Cna49QdpRPDv+23782/EVjTuBUIqwL5xeds2Pm2GbbxJGDTjBAItx6J1fp9FP /bCczgAgpM926fVXj0b+1RMUfDseMYIHPsX+clldRVF484XSzEITbUTVMHCtLK0EdG L5fuNUgZPKou1x3wt+w+8kiuw32aFpA+5XiG3DqoU/GlA+hrLPyH52R1oSfCpDL6QK osDrXaUQehf3Q== Date: Tue, 6 Dec 2022 08:40:46 +1100 From: Stephen Rothwell To: Mark Brown Cc: Mathieu Poirier , Amit Kumar Mahapatra , Ben Levinsky , Linux Kernel Mailing List , Linux Next Mailing List , Michal Simek , Rajan Vaja , Tanmay Shah , Bjorn Andersson Subject: Re: linux-next: manual merge of the rpmsg tree with the spi tree Message-ID: <20221206084046.020e03ea@canb.auug.org.au> In-Reply-To: References: <20221128134120.0afdceb3@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/S2lGb1uH3ibi7K8ZXJB/PPE"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/S2lGb1uH3ibi7K8ZXJB/PPE Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Mark, On Mon, 5 Dec 2022 19:55:19 +0000 Mark Brown wrote: > > On Mon, Dec 05, 2022 at 10:24:48AM -0700, Mathieu Poirier wrote: > > On Sun, 27 Nov 2022 at 19:41, Stephen Rothwell w= rote: =20 >=20 > > > 1e400cb9cff2 ("firmware: xilinx: Add qspi firmware interface") =20 >=20 > > Mark - since this is in the SPI tree, can you send me a pull request > > for this commit? I will do the refactoring on my side. =20 >=20 > That would basically be the entire SPI tree up to that point since it's > all mostly on one branch... Both sides just need to mention it to Linus when you send your pull requests - it is not a problematic conflict. --=20 Cheers, Stephen Rothwell --Sig_/S2lGb1uH3ibi7K8ZXJB/PPE Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmOOZV4ACgkQAVBC80lX 0GzIYQf/SYMRngv9pUYycVE9ytTC7tm0BORJ14YbhSXypSrQsczbkWKYjW61ga3m 685lyMDsH18g+SV/zsTpcbe7F9GdHO0mWBo9eoNHJepmCGDRzz/tnOlZc1W7jJLT frXyxRQ4nHEvOLykMTAsI0d7LJvByn6AT/4ESVK09hqY5MZQVOoTxUY6tcSzrK53 0rVFjqliVzNwHTSpOPRRutP4y1xVbTvJYBUXEMQ90hYNu/livDG5YkGkq1A4dRWY b3PTjJ9cgHE6zBCEMQpgWOZEnAVCrmaoCr9jvLp7XHRnOmznV727bOMDWEuS/FN8 EJg8WB4C4wvZAxgKn2MbZivWoaCLyA== =cRXS -----END PGP SIGNATURE----- --Sig_/S2lGb1uH3ibi7K8ZXJB/PPE--