From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: Planning the merge of KVM/arm64
Date: Tue, 04 Jun 2013 13:29:34 +0100 [thread overview]
Message-ID: <51ADDDAE.4040705@arm.com> (raw)
Guys,
The KVM/arm64 code is now, as it seems, in good enough shape to be
merged. I've so far addressed all the comments, and it doesn't seem any
worse then what is queued for its 32bit counterpart.
For reference, it is sitting there:
git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git
kvm-arm64/kvm
What is not defined yet is the merge path:
- It is touching some of the arm64 core code, so it would be better if
it was merged through the arm64 tree
- It is depending on some of the patches in the core KVM queue (the
vgic/timer move to virt/kvm/arm/)
- It is also depending on some of the patches that are in the KVM/ARM
queue (parametrized timer interrupt, some MMU/MMIO fixes)
So I can see two possibilities:
- Either I can rely on a stable branch from both KVM and KVM/ARM trees
on which I can base my tree for Catalin/Will to pull,
- Or I ask Catalin to only pull the arm64 part *minus the Kconfig*, and
only merge this last bit when the dependencies are satisfied in Linus' tree.
What do you guys think?
Thanks,
M.
--
Jazz is not dead. It just smells funny...
next reply other threads:[~2013-06-04 12:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 12:29 Marc Zyngier [this message]
2013-06-04 13:13 ` Planning the merge of KVM/arm64 Anup Patel
2013-06-04 13:19 ` Marc Zyngier
2013-06-04 13:41 ` Catalin Marinas
2013-06-04 14:50 ` Christoffer Dall
2013-06-04 14:59 ` Marc Zyngier
2013-06-04 15:30 ` Paolo Bonzini
2013-06-04 15:40 ` Will Deacon
2013-06-04 15:48 ` Steve Capper
2013-06-04 15:42 ` Marc Zyngier
2013-06-04 15:43 ` Christoffer Dall
2013-06-04 15:51 ` Paolo Bonzini
2013-06-04 16:37 ` Gleb Natapov
2013-06-05 5:57 ` Christoffer Dall
2013-06-05 6:01 ` Gleb Natapov
2013-06-05 9:31 ` Catalin Marinas
2013-06-05 12:57 ` Gleb Natapov
2013-06-05 13:13 ` Marc Zyngier
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=51ADDDAE.4040705@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.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).