From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Will Deacon <will@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul@pwsan.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jeremy Linton <jeremy.linton@arm.com>,
Atish Patra <atish.patra@wdc.com>
Subject: Re: linux-next: manual merge of the risc-v tree with the arm64 tree
Date: Tue, 13 Aug 2019 18:42:11 +1000 [thread overview]
Message-ID: <20190813184211.09b93f31@canb.auug.org.au> (raw)
In-Reply-To: <20190813082422.lecgqtknnn5g4dyj@willie-the-truck>
[-- Attachment #1: Type: text/plain, Size: 779 bytes --]
Hi Will,
On Tue, 13 Aug 2019 09:24:23 +0100 Will Deacon <will@kernel.org> wrote:
>
> Paul, Palmer -- If it's not too late, then it would probably be best to
> stick this commit (60c1b220d8bc) and any dependencies on their own stable
> branch so that we can both pull it into our respective trees and I can
> resolve this conflict in the arm64 tree, which I'll send early during the
> merge window.
>
> Looking at your tree, I guess I could just pull in
> common/for-v5.4-rc1/cpu-topology if you promise never to rebase it. Failing
> that, you could fork a new branch from 60c1b220d8bc and I could just pull
> that part instead.
It may not be worth it, the conflict is not that bad. Unless you
forsee more conflicts arising.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-08-13 8:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 23:34 linux-next: manual merge of the risc-v tree with the arm64 tree Stephen Rothwell
2019-08-13 8:24 ` Will Deacon
2019-08-13 8:42 ` Stephen Rothwell [this message]
2019-08-13 8:53 ` Will Deacon
2019-08-13 22:24 ` Paul Walmsley
2019-08-14 9:00 ` Will Deacon
2021-01-27 23:27 Stephen Rothwell
2021-02-14 21:52 ` Stephen Rothwell
2024-03-14 23:31 Stephen Rothwell
2024-03-15 17:21 ` Palmer Dabbelt
2024-03-15 18:19 ` Catalin Marinas
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=20190813184211.09b93f31@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=atish.patra@wdc.com \
--cc=catalin.marinas@arm.com \
--cc=jeremy.linton@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul@pwsan.com \
--cc=will@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).