From: Paul Walmsley <paul@pwsan.com>
To: Will Deacon <will@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Palmer Dabbelt <palmer@dabbelt.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 22:24:30 +0000 (UTC) [thread overview]
Message-ID: <alpine.DEB.2.21.999.1908132220450.13287@utopia.booyaka.com> (raw)
In-Reply-To: <20190813082422.lecgqtknnn5g4dyj@willie-the-truck>
Hi folks,
On Tue, 13 Aug 2019, Will Deacon wrote:
> On Tue, Aug 13, 2019 at 09:34:47AM +1000, Stephen Rothwell wrote:
> > Today's linux-next merge of the risc-v tree got a conflict in:
> >
> > arch/arm64/kernel/topology.c
> >
> > between commit:
> >
> > 98dc19902a0b ("arm64: topology: Use PPTT to determine if PE is a thread")
> >
> > from the arm64 tree and commit:
> >
> > 60c1b220d8bc ("cpu-topology: Move cpu topology code to common code.")
> >
> > from the risc-v tree.
> >
> > I fixed it up (see below) 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.
>
> Thanks, Stephen.
>
> 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.
How about if we treat common/for-v5.4-rc1/cpu-topology as a stable branch?
I wasn't planning to rebase it. Then both of us can just merge it into
our for-next branches for the merge window? (It looks like I will need to
rebuild the riscv for-next branch on top of v5.3-rc5, for unrelated
reasons.)
Sound reasonable?
- Paul
next prev parent reply other threads:[~2019-08-13 22:31 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
2019-08-13 8:53 ` Will Deacon
2019-08-13 22:24 ` Paul Walmsley [this message]
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=alpine.DEB.2.21.999.1908132220450.13287@utopia.booyaka.com \
--to=paul@pwsan.com \
--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=sfr@canb.auug.org.au \
--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).