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
Date: Tue, 6 Dec 2022 08:40:46 +1100 [thread overview]
Message-ID: <20221206084046.020e03ea@canb.auug.org.au> (raw)
In-Reply-To: <Y45MpxPpWBSkBsyp@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 721 bytes --]
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> wrote:
>
> > > 1e400cb9cff2 ("firmware: xilinx: Add qspi firmware interface")
>
> > 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.
>
> 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-12-05 21:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 2:41 Stephen Rothwell
2022-12-05 17:24 ` Mathieu Poirier
2022-12-05 19:55 ` Mark Brown
2022-12-05 21:40 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221206084046.020e03ea@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=amit.kumar-mahapatra@amd.com \
--cc=andersson@kernel.org \
--cc=ben.levinsky@amd.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=michal.simek@amd.com \
--cc=rajan.vaja@xilinx.com \
--cc=tanmay.shah@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®