Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 6 Dec 2022 08:40:46 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Mark Brown <broonie@kernel.org>
Cc:     Mathieu Poirier <mathieu.poirier@linaro.org>,
        Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>,
        Ben Levinsky <ben.levinsky@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michal Simek <michal.simek@amd.com>,
        Rajan Vaja <rajan.vaja@xilinx.com>,
        Tanmay Shah <tanmay.shah@amd.com>,
        Bjorn Andersson <andersson@kernel.org>
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: <Y45MpxPpWBSkBsyp@sirena.org.uk>
References: <20221128134120.0afdceb3@canb.auug.org.au>
        <CANLsYkw0Nq38rZzGTTpCL4J3aWJQpX32iOe4zdTT0+CcfhcOmg@mail.gmail.com>
        <Y45MpxPpWBSkBsyp@sirena.org.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/S2lGb1uH3ibi7K8ZXJB/PPE";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--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 <broonie@kernel.org> wrote:
>
> On Mon, Dec 05, 2022 at 10:24:48AM -0700, Mathieu Poirier wrote:
> > On Sun, 27 Nov 2022 at 19:41, Stephen Rothwell <sfr@canb.auug.org.au> 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--